Timeshare Admin Page

src/components/admin/status/editTimeShareAdminPage.vue

@@ -11,50 +11,6 @@
           <div align="left" class="custom-control custom-switch mb-2">
             <div class="row">
               <div align="center" class="col">
-                <!-- <label class="mr-5">Were you referred by an agent?</label> -->
-                <!-- <input
-                  type="checkbox"
-                  class="custom-control-input"
-                  id="customSwitch1"
-                  :checked="refAgent"
-                  @change="changeRef"
-                /> -->
-                <!-- <label class="custom-control-label" for="customSwitch1">{{
-                  refAgent ? "Yes" : "No"
-                }}</label> -->
-                <!-- <div class="refbyAgent" :class="{ 'refbyAgent--clicked': refAgent }">
-                  <div class="col-md-6" v-if="refAgent">
-                    <label for="Name of Agency">Agency</label>
-                    <select
-                      class="form-control uniSelect"
-                      id="Agency"
-                      name="agency"
-                      v-model="sellItem.agencyId"
-                    >
-                      <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">
-                    <label for="Name of Agent">Agent</label>
-                    <select
-                      class="form-control uniSelect"
-                      id="agent"
-                      name="agent"
-                      v-model="sellItem.agentId"
-                      :disabled="!sellItem.agencyId"
-                    >
-                      <option
-                        v-for="(item, i) in displayNotDeletedAgents"
-                        :key="i"
-                        :value="item.id"
-                      >
-                        <div>{{ item.name + " " + item.surname }}</div>
-                      </option>
-                    </select>
-                  </div>
-                </div> -->
               </div>
             </div>
           </div>
@@ -65,17 +21,17 @@
             <div class="form-row">
               <div class="form-group col-md-6">
                 <div class="input-group">
-                  <label v-if="!sellItem.region" class="uniSelectLabel" for="weekInfoRegionSelect"
+                  <!-- {{weekParam}} -->
+                  <label class="uniSelectLabel" for="weekInfoRegionSelect"
                     >REGION</label
                   >
-
                   <select
                     id="weekInfoRegionSelect"
                     class="form-control uniSelect"
-                    v-model="week.region"
+                    v-model="selectedRegion"
                     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.regionCode">{{
                       region.regionName
                     }}</option>
                   </select>
@@ -84,18 +40,17 @@
               </div>
               <div class="form-group col-md-6">
                 <div class="input-group">
-                  <label v-if="!sellItem.resort" class="uniSelectLabel" for="weekInfoResortSelect"
+                  <label class="uniSelectLabel" for="weekInfoResortSelect"
                     >RESORT NAME</label
                   >
 
                   <select
                     id="weekInfoResortSelect"
                     class="form-control uniSelect"
-                    v-model="sellItem.resort"
-                    @change="resortChange()"
+                    v-model="selectedResort"
                   >
                     <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.resortCode">{{
                       resort.resortName
                     }}</option>
                   </select>
@@ -105,24 +60,24 @@
               <div class="form-group col-md-6">
                 <input
                   class="form-control"
-                  v-if="sellItem.otherResort"
+                  v-if="weekParam.otherResort"
                   placeholder="NAME OF RESORT (* IF OTHER)"
                   type="text"
                   name="other"
-                  v-model="sellItem.otherResortName"
+                  v-model="weekParam.otherResortName"
                 />
               </div>
               <div class="form-group col-md-6">
-                <div v-if="sellItem.otherResort">
-                  <label v-if="!sellItem.region" class="uniSelectLabel" for="region">REGION</label>
+                <div v-if="weekParam.otherResort">
+                  <label v-if="!weekParam.region" class="uniSelectLabel" for="region">REGION</label>
                 </div>
 
                 <select
                   class="form-control uniSelect"
-                  v-if="sellItem.otherResort"
+                  v-if="weekParam.otherResort"
                   name="region"
                   id="region"
-                  v-model="sellItem.region"
+                  v-model="weekParam.region"
                 >
                   <option v-for="(region, r) in regions" :key="r">{{ region.regionName }}</option>
                 </select>
@@ -134,38 +89,38 @@
                   name="unitNumber"
                   id="unitNumber"
                   placeholder="UNIT NUMBER"
-                  v-model="sellItem.unitNumber"
+                  v-model="weekParam.unitNumber"
                   data-msg="Please enter unit number"
                 />
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
                 <input
-                  type="number"
+                  type="text"
                   class="form-control"
                   name="week"
                   id="week"
                   placeholder="UNIT / WEEK NUMBER"
-                  v-model="sellItem.module"
+                  v-model="weekParam.weekNumber"
                   data-msg="Please enter week number"
                 />
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.season" class="uniSelectLabel" for="region">SEASON</label>
+                <label class="uniSelectLabel" for="region">SEASON</label>
 
                 <select
                   class="form-control uniSelect"
-                  name="region"
-                  id="region"
-                  v-model="sellItem.season"
+                  name="season"
+                  id="season"
+                  v-model="selectedSeason"
                 >
                   <option v-for="(season, r) in seasons" :key="r">{{ season.name }}</option>
                 </select>
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region"
+                <label class="uniSelectLabel" for="region"
                   >BEDROOM/S</label
                 >
 
@@ -173,14 +128,14 @@
                   class="form-control uniSelect"
                   name="region"
                   id="region"
-                  v-model="sellItem.bedrooms"
+                  v-model="selectedBedrooms"
                 >
                   <option v-for="(item, i) in resortBedrooms" :key="i">{{ item }}</option>
                 </select>
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region"
+                <label class="uniSelectLabel" for="region"
                   >SLEEP MAX</label
                 >
 
@@ -188,7 +143,7 @@
                   class="form-control uniSelect"
                   name="region"
                   id="region"
-                  v-model="sellItem.maxSleep"
+                  v-model="selectedMaxSleep"
                 >
                   <option v-for="(item, i) in maxSleep" :key="i">{{ item }}</option>
                 </select>
@@ -201,20 +156,20 @@
                   name="levy"
                   id="levy"
                   placeholder="Levy Amount"
-                  v-model="sellItem.levyAmount"
+                  v-model="weekParam.levyAmount"
                   data-msg="Please enter levy amount"
                 />
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.weekType" class="uniSelectLabel" for="region"
+                <label class="uniSelectLabel" for="region"
                   >WEEK TYPE</label
                 >
                 <select
                   class="form-control uniSelect"
                   name="region"
                   id="region"
-                  v-model="sellItem.weekType"
+                  v-model="selectedWeekType"
                 >
                   <option :key="0">Flexi</option>
                   <option :key="1">Fixed</option>
@@ -226,20 +181,20 @@
               <div class="form-group col-md-6">
                 Arrival Date :
                 <input
-                  type="date"
+                  type="datetime-local"
                   class="form-control"
                   name="occupationDate1"
-                  v-model="sellItem.arrivalDate"
+                  v-model="weekParam.arrivalDate"
                 />
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
                 Departure Date :
                 <input
-                  type="date"
+                  type="datetime-local"
                   class="form-control"
                   name="occupationDate2"
-                  v-model="sellItem.departureDate"
+                  v-model="weekParam.departureDate"
                 />
                 <div class="validation"></div>
               </div>
@@ -251,7 +206,7 @@
                   type="number"
                   step="any"
                   name="purchasePrice"
-                  v-model="sellItem.originalPurchasePrice"
+                  v-model="weekParam.sellPrice"
                 />
                 <div class="validation"></div>
               </div>
@@ -268,7 +223,6 @@
                   class="custom-control-input"
                   id="customSwitch2"
                   :checked="sellItem.currentYearBanked"
-                  @change="changeCurrentBanked"
                 />
                 <label class="custom-control-label" for="customSwitch2">{{
                   sellItem.currentYearBanked ? "Yes" : "No"
@@ -309,7 +263,7 @@
                   placeholder="Name"
                   data-rule="minlen:4"
                   data-msg="Please enter your name"
-                  v-model="indiv.name"
+                  v-model="week.owner.name"
                 />
                 <div class="validation"></div>
               </div>
@@ -321,7 +275,7 @@
                   id="surname"
                   placeholder="Surname"
                   data-msg="Please enter your surname"
-                  v-model="indiv.surname"
+                  v-model="week.owner.surname"
                 />
                 <div class="validation"></div>
               </div>
@@ -336,7 +290,7 @@
                   placeholder="ID Number"
                   data-rule="minlen:4"
                   data-msg="Please enter your ID number"
-                  v-model="indiv.idNumber"
+                  v-model="week.owner.idNumber"
                 />
                 <div class="validation"></div>
               </div>
@@ -349,37 +303,12 @@
                   placeholder="Company Reg Number"
                   data-rule="minlen:4"
                   data-msg="Please enter your company reg number"
-                  v-model="indiv.companyRegNumber"
+                  v-model="week.owner.companyRegNumber"
                 />
                 <div class="validation"></div>
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-6">
-                <div class="input-group">
-                  <label
-                    v-if="!indiv.howMarried || indiv.howMarried === 'N/A'"
-                    for="howMarried"
-                    class="uniSelectLabel"
-                    >Marital Status</label
-                  >
-                  <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="Other">Other</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="Partner">Partner</option>
-                  </select>
-                </div>
-                <div class="validation"></div>
-              </div>
               <div class="form-group col-md-6">
                 <input
                   type="text"
@@ -388,7 +317,7 @@
                   id="email"
                   placeholder="Email Address"
                   data-msg="Please enter your email address"
-                  v-model="indiv.emailAddress"
+                  v-model="week.owner.emailAddress"
                 />
                 <div class="validation"></div>
               </div>
@@ -403,7 +332,7 @@
                   placeholder="Cell Number"
                   data-rule="minlen:4"
                   data-msg="Please enter your cell number"
-                  v-model="indiv.cellNumner"
+                  v-model="week.owner.cellNumner"
                 />
                 <div class="validation"></div>
               </div>
@@ -415,95 +344,63 @@
                   id="landline"
                   placeholder="Landline Number"
                   data-msg="Please enter your landline number"
-                  v-model="indiv.landlineNumber"
+                  v-model="week.owner.landlineNumber"
                 />
                 <div class="validation"></div>
               </div>
             </div>
           </div>
-          <div v-if="indiv.howMarried === 'In Community Of Property'" class="section-header">
-            <h2>Spouse Details</h2>
+                    <div class="section-header">
+            <h2>Publish Timeshare Week</h2>
           </div>
-          <div v-if="indiv.howMarried === 'In Community Of Property'" class="form">
-            <div class="form-row">
-              <div class="form-group col-md-6">
-                <input
-                  type="text"
-                  class="form-control"
-                  placeholder="SPOUSE NAME"
-                  data-msg="Please enter your spouse's name"
-                  v-model="indiv.spouseName"
-                />
-                <div class="validation"></div>
-              </div>
-              <div class="form-group col-md-6">
-                <input
-                  type="text"
-                  class="form-control"
-                  placeholder="SPOUSE SURNAME"
-                  data-msg="Please enter your spouse's surname"
-                  v-model="indiv.spouseSurname"
-                />
-                <div class="validation"></div>
-              </div>
+          <div class="form">
+            <div class="row">
               <div class="form-group col-md-6">
-                <input
-                  type="text"
-                  class="form-control"
-                  placeholder="SPOUSE EMAIL"
-                  data-rule="minlen:4"
-                  data-msg="Please enter your spouse's email"
-                  v-model="indiv.spouseEmail"
-                />
-                <div class="validation"></div>
+                <label class="uniSelectLabel" for="region"
+                  >STATUS</label
+                >
+                <select
+                  class="form-control uniSelect"
+                  name="region"
+                  id="region"
+                  v-model="selectedWeekType"
+                >
+                  <option :key="0">For Sale</option>
+                  <option :key="1">Sold</option>
+                </select>
               </div>
               <div class="form-group col-md-6">
-                <input
-                  type="text"
-                  class="form-control"
-                  placeholder="SPOUSE TELEPHONE"
-                  data-rule="minlen:4"
-                  data-msg="Please enter your spouse's telephone number"
-                  v-model="indiv.spouseTelephone"
-                />
-                <div class="validation"></div>
+                <label class="uniSelectLabel" for="region"
+                  >Publish</label
+                >
+                <select
+                  class="form-control uniSelect"
+                  name="region"
+                  id="region"
+                  v-model="selectedWeekType"
+                >
+                  <option :key="0">Yes</option>
+                  <option :key="1">No</option>
+                </select>
               </div>
-              <div class="form-group col-md-6">
+                            <div class="form-group col-md-6">
+                Date Published :
                 <input
-                  type="text"
+                  type="datetime-local"
                   class="form-control"
-                  placeholder="SPOUSE CELL NUMBER"
-                  data-rule="minlen:4"
-                  data-msg="Please enter your spouse's cellphone number"
-                  v-model="indiv.spouseCellnumber"
+                  name="occupationDate2"
+                  v-model="datetime"
                 />
                 <div class="validation"></div>
               </div>
+
             </div>
-                          <div class="form-group col-md-6">
-                <input
-                  type="text"
-                  class="form-control"
-                  placeholder="SPOUSE CELL NUMBER"
-                  data-rule="minlen:4"
-                  data-msg="Please enter your spouse's cellphone number"
-                  v-model="indiv.spouseCellnumber"
-                />
-                <div class="validation"></div>
-              </div>
           </div>
-
           <div class="form">
             <div id="sendmessage">Your details has been sent. Thank you!</div>
             <div id="errormessage"></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>
-              </div>
-            </div>
-            <div class="text-center col-12" v-if="CanSave">
-              <button class="btn-solid-blue">
+            <div class="text-center col-12" >
+              <button class="btn-solid-blue" v-on:click="saveEdit()">
                 Save
               </button>
             </div>
@@ -514,7 +411,6 @@
             <br />
           </div>
         </div>
-
         <br />
         <br />
       </div>
@@ -535,6 +431,7 @@ import _ from "lodash";
 export default {
   name: "EditTimeshare",
   props: {
+    weekParam: {},
     weekId: {
       default: 0
     }
@@ -545,20 +442,36 @@ export default {
       userLoggedIn: Log.isLoggedIn(),
       listedWeekId: this.$route.params.id,
       selectedItems: [],
+      selectedRegion: {},
+      selectedResort: {},
+      selectedSeason: {},
+      selectedBedrooms: {},
+      selectedMaxSleep: {},
+      selectedWeekType: {},
     };
   },
   components: {
     addressAutoComplete,
     Alert
   },
-  mounted() {
+  async mounted() {
     if (this.sellItem.id) {
       this.newSale();
     }
+    if (this.weekParam.season === "Peak") {
+      this.selectedSeason = "Peak 1"
+    } else {
+      this.selectedSeason = this.weekParam.season;
+    }
     this.initTimeshare(0);
     this.getIndividual(Log.getUser().id);
     this.getBanks();
-    this.getWeek(this.$route.params.id)
+    this.getWeek(this.weekParam.id);
+    this.selectedRegion = this.weekParam.region.regionCode;
+    this.selectedResort = this.weekParam.resort.resortCode;
+    this.selectedBedrooms = this.weekParam.bedrooms;
+    this.selectedMaxSleep = this.weekParam.maxSleep;
+    this.selectedWeekType = this.weekParam.weekType;
   },
   created() {
     this.initTimeshare(this.weekId);
@@ -606,114 +519,63 @@ export default {
     isLoggedIn() {
       return this.user && this.person;
     },
-    displayNotDeletedAgents() {
-      var notDeletedArr = [];
-      this.agents.forEach(agent => {
-        if (!agent.isDeleted) {
-          if (agent.agencyId === this.sellItem.agencyId) {
-            notDeletedArr.push(agent);
-          }
-        }
-      });
-      return notDeletedArr;
-    },
-    CanSave() {
-      if (this.indiv.howMarried === "In Community Of Property") {
-        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("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
-    ...mapActions("myWeeks", ["getItems", "getWeek"]),
+    ...mapActions("myWeeks", ["getItems", "getWeek", "editSave"]),
     newSale() {
       this.weekId = 0;
       this.getBlankWeek();
     },
-    submitSale() {
-      if (this.userLoggedIn) {
-        this.sellItem.ownerObject = this.indiv;
-        this.sellItem.status = undefined;
-        this.saveWeek(this.sellItem).then(fulfilled => {
-          this.paygateRedirect();
-        });
-      } else this.$router.push("/user/login");
-    },
-    paygateRedirect() {
-      var paymentObj = {
-        timeshareWeekId: this.sellItem.id, // this.sellItem.Id,
-        propertyId: 0,
-        creatydById: Log.getUser().id, //Log.getUser().id,
-        amount: 380.0,
-        paymentStatus: "",
-        paymentToken: ""
-      };
-
-      this.addPayment(paymentObj).then(res => {
-        this.$router.push({
-          name: "PaymentGateway",
-          params: {
-            paymentReqId: res.PAY_REQUEST_ID,
-            checksum: res.CHECKSUM
-          }
-        });
+    saveEdit() {
+      this.regions.forEach(region => {
+        if (region.regionCode === this.selectedRegion) {
+          this.weekParam.region = region;
+        }
       });
-    },
-    previewFiles(event) {
-      console.log(event.target.files);
-    },
-    changeRef() {
-      this.sellItem.agent = undefined;
-      this.sellItem.agency = undefined;
-      this.sellItem.referedByAgent = !this.sellItem.referedByAgent;
-    },
-    changeLeviesPaidInFull() {
-      this.sellItem.leviesPaidInFull = !this.sellItem.leviesPaidInFull;
-    },
-    changeWeekPlacedForRental() {
-      this.sellItem.weekPlacedForRental = !this.sellItem.weekPlacedForRental;
-    },
-    changeCurrentBanked() {
-      this.sellItem.bankedWith = undefined;
-      this.sellItem.currentYearBanked = !this.sellItem.currentYearBanked;
+      this.resorts.forEach(resort => {
+        if (resort.resortCode === this.selectedResort) {
+          this.weekParam.resort = resort;
+        }
+      });
+      this.seasons.forEach(season => {
+        if (season.name === this.selectedSeason) {
+          this.weekParam.season = season;
+        }
+      });
+      this.bedrooms.forEach(beedroom => {
+        if (bedroom === this.selectedBedrooms) {
+          this.weekParam.beedroom = beedroom
+        }
+      });
+      this.maxSleep.forEach(sleepMax => {
+        if (maxSleep === this.selectedMaxSleep) {
+          this.weekParam.maxSleep = maxSleep
+        }
+      });
+      this.weekType.forEach(typeWeek => {
+        if (weekType === this.selectedWeekType) {
+          this.weekParam.weekType = weekType
+        }
+      });
+      console.log(this.weekParam);
+      this.editSave(this.weekParam);
     },
     resortChange() {
       this.onResortChange({
-        resortName: this.sellItem.resort.resortName,
-        resortCode: this.sellItem.resort.resortCode
+        resortName: this.week.resort.resortName,
+        resortCode: this.week.resort.resortCode
       });
 
-      if (this.sellItem && this.sellItem.resort === "Other") {
-        this.sellItem.otherResortName = undefined;
-        this.sellItem.otherResort = true;
-      } else {
-        this.sellItem.otherResortName = undefined;
-        this.sellItem.otherResort = false;
-      }
-    },
-    regionChange() {
-      this.sellItem.regionId = this.sellItem.region ? this.sellItem.region.id : 1;
-    },
-    UpdateAddress(address) {
-      this.indiv.address.streetNumber = address.streetNumber;
-      this.indiv.address.street = address.streetName;
-      this.indiv.address.province = address.province;
-      this.indiv.address.city = address.city;
-      this.indiv.address.suburb = address.suburb;
-      this.indiv.address.postalCode = address.postalCode;
-    },
-    SetMandateDate() {
-      if (this.sellItem.mandate) {
-        this.sellItem.mandateDate = new Date();
+      if (this.week && this.week.resort === "Other") {
+        this.week.otherResortName = undefined;
+        this.week.otherResort = true;
       } else {
-        this.sellItem.mandateDate = undefined;
+        this.week.otherResortName = undefined;
+        this.week.otherResort = false;
       }
     },
     backToListView() {

src/components/admin/status/timeshareAdminPage.vue

@@ -182,7 +182,8 @@ export default {
       this.selectedItems = items;
     },
     onEdit(item) {
-      this.$router.push(`/editTimeShare/${item.id}`);
+      this.$router.push({ name: 'EditTimeshare', params: { weekParam: item } });
+      // this.$router.push(`/editTimeShare/${item.id}`);
     },
     onClearSelected() {
       this.selectedItems = [];

src/router/index.js

@@ -459,8 +459,11 @@ export default new Router({
       component: ToBuySearch
     },
     {
-      path: "/editTimeShare/:id",
+      path: "/editTimeShare",
       name: "EditTimeshare",
+      props: route => ({
+        ...route.params
+      }),
       component: MyWeeksEdit
     }
   ]

src/store/modules/timeshare/myWeeks.js

@@ -13,7 +13,19 @@ export default {
     },
     setItem(state, item) {
       state.week = item;
-    }
+    },
+    updateItem(state, item) {
+      var index
+    var count = 0
+    state.items.forEach((el) => {
+      if (el.id === item.id) {
+        index = count
+      }
+      count++
+    })
+
+    Object.assign(state.items[index], item)
+    },
   },
   getters: {
     getNeedsVerify(state) {
@@ -59,5 +71,13 @@ export default {
       })
       .catch(console.error);
     },
+    editSave({ commit }, week) {
+      axios
+      .put(`/api/timeshareweek`, week)
+      .then(r => {
+        commit('updateItem', r.data);
+      })
+      .catch(console.error);
+    }
   },
 };