Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivateProperties

src/components/admin/status/editTimeShareAdminPage.vue

@@ -9,52 +9,7 @@
             </div>
             <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 align="center" class="col"></div>
               </div>
             </div>
 
@@ -64,26 +19,19 @@
               <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
-                    >
-                    <float-label label="REGION" style="width:100%" fixed>
-                      <select
-                        class="form-control uniSelect"
-                        v-model="selectedRegion"
-                        style="font-size: 15px"
-                      >
-                        <option
-                          v-for="(region, r) in regions"
-                          :key="r"
-                          :value="region.regionCode"
-                          >{{ region.regionName }}</option
-                        >
-                      </select>
-                    </float-label>
-
-                    <div class="validation"></div>
+                    <label class="uniSelectLabel" for="weekInfoRegionSelect">REGION</label>
                   </div>
+                  <select
+                    class="form-control uniSelect"
+                    v-model="selectedRegion"
+                    style="font-size: 15px"
+                  >
+                    <option v-for="(region, r) in regions" :key="r" :value="region.regionCode">{{
+                      region.regionName
+                    }}</option>
+                  </select>
+                  <div class="validation"></div>
+
                   <div class="validation"></div>
                 </div>
                 <div class="form-group col-md-6">
@@ -100,6 +48,15 @@
                       </select>
                     </float-label>
 
+                    <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
+                      >
+                    </select>
                     <div class="validation"></div>
                   </div>
                   <div class="validation"></div>
@@ -239,27 +196,24 @@
                   </float-label>
                 </div>
                 <div class="form-row">
-                  <div class="form-group col-md-6 mt-2">
-                    <float-label label="ARRIVAL DATE">
-                      <input
-                        type="datetime-local"
-                        class="form-control"
-                        name="occupationDate1"
-                        v-model="weekParam.arrivalDate"
-                      />
-                    </float-label>
-
+                  <div class="form-group col-md-6">
+                    Arrival Date :
+                    <input
+                      type="date"
+                      class="form-control"
+                      name="occupationDate1"
+                      v-model="dateParam"
+                    />
                     <div class="validation"></div>
                   </div>
-                  <div class="form-group col-md-6 mt-2">
-                    <float-label label="DEPARTURE DATE">
-                      <input
-                        type="datetime-local"
-                        class="form-control"
-                        name="occupationDate2"
-                        v-model="weekParam.departureDate"
-                      />
-                    </float-label>
+                  <div class="form-group col-md-6">
+                    Departure Date :
+                    <input
+                      type="date"
+                      class="form-control"
+                      name="occupationDate2"
+                      v-model="depDateParam"
+                    />
                     <div class="validation"></div>
                   </div>
                   <div class="form-group col-md-6 mt-2">
@@ -288,9 +242,9 @@
                     id="customSwitch2"
                     :checked="sellItem.currentYearBanked"
                   />
-                  <label class="custom-control-label" for="customSwitch2">{{
-                    sellItem.currentYearBanked ? "Yes" : "No"
-                  }}</label>
+                  <label class="custom-control-label" for="customSwitch2">
+                    {{ sellItem.currentYearBanked ? "Yes" : "No" }}
+                  </label>
                   <div
                     class="spacebanked1"
                     :class="{ 'spacebanked1--clicked': sellItem.currentYearBanked }"
@@ -301,24 +255,6 @@
                         v-if="sellItem.currentYearBanked"
                         >Please confirm with whom</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>
@@ -454,45 +390,37 @@
             <div class="form">
               <div class="row">
                 <div class="form-group col-md-6">
-                  <label v-if="!selectedWeekType" class="uniSelectLabel" for="region">STATUS</label>
-                  <float-label label="STATUS" fixed>
-                    <select
-                      class="form-control uniSelect"
-                      name="region"
-                      id="region"
-                      v-model="selectedWeekType"
-                    >
-                      <option :key="0">For Sale</option>
-                      <option :key="1">Sold</option>
-                    </select>
-                  </float-label>
+                  <label class="uniSelectLabel" for="status">STATUS</label>
+                  <select
+                    class="form-control uniSelect"
+                    name="status"
+                    id="status"
+                    v-model="weekParam.weekStatus"
+                  >
+                    <option :key="0">For Sale</option>
+                    <option :key="1">Sold</option>
+                  </select>
                 </div>
                 <div class="form-group col-md-6">
-                  <label v-if="!selectedWeekType" class="uniSelectLabel" for="region"
-                    >Publish</label
+                  <label class="uniSelectLabel" for="publish">Publish</label>
+                  <select
+                    class="form-control uniSelect"
+                    name="publish"
+                    id="publish"
+                    v-model="weekParam.publish"
                   >
-                  <float-label label="Publish" fixed>
-                    <select
-                      class="form-control uniSelect"
-                      name="region"
-                      id="region"
-                      v-model="selectedWeekType"
-                    >
-                      <option :key="0">Yes</option>
-                      <option :key="1">No</option>
-                    </select>
-                  </float-label>
+                    <option :key="0" :value="false">No</option>
+                    <option :key="1" :value="true">Yes</option>
+                  </select>
                 </div>
-                <div class="form-group col-md-6 mt-2">
-                  <float-label label="DATE PUBLISHED" fixed>
-                    <input
-                      type="datetime-local"
-                      class="form-control"
-                      name="occupationDate2"
-                      v-model="datetime"
-                    />
-                  </float-label>
-
+                <div class="form-group col-md-6">
+                  Date Published :
+                  <input
+                    type="date"
+                    class="form-control"
+                    name="publishDate"
+                    v-model="pubDateParam"
+                  />
                   <div class="validation"></div>
                 </div>
               </div>
@@ -501,9 +429,7 @@
               <div id="sendmessage">Your details has been sent. Thank you!</div>
               <div id="errormessage"></div>
               <div class="text-center col-12">
-                <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-12">
                 <button class="btn-solid-blue" v-on:click="backToListView()">Back</button>
@@ -547,7 +473,12 @@ export default {
       selectedSeason: {},
       selectedBedrooms: {},
       selectedMaxSleep: {},
-      selectedWeekType: {}
+      selectedWeekType: {},
+      selectedStatus: {},
+      selectedPublish: {},
+      dateParam: {},
+      depDateParam: {},
+      pubDateParam: {}
     };
   },
   components: {
@@ -572,6 +503,14 @@ export default {
     this.selectedBedrooms = this.weekParam.bedrooms;
     this.selectedMaxSleep = this.weekParam.maxSleep;
     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);
+    this.dateParam = date;
+    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);
+    this.pubDateParam = datePub;
   },
   created() {
     this.initTimeshare(this.weekId);
@@ -638,29 +577,38 @@ export default {
       });
       this.resorts.forEach(resort => {
         if (resort.resortCode === this.selectedResort) {
-          this.weekParam.resort = resort;
+          this.weekParam.resortName = resort.resortName;
         }
       });
       this.seasons.forEach(season => {
-        if (season.name === this.selectedSeason) {
-          this.weekParam.season = season;
+        if (season.name === this.selectedSeason.name) {
+          this.weekParam.season = season.name;
         }
       });
-      this.bedrooms.forEach(beedroom => {
+      this.resortBedrooms.forEach(bedroom => {
         if (bedroom === this.selectedBedrooms) {
-          this.weekParam.beedroom = beedroom;
+          this.weekParam.bedroom = bedroom;
         }
       });
       this.maxSleep.forEach(sleepMax => {
-        if (maxSleep === this.selectedMaxSleep) {
-          this.weekParam.maxSleep = maxSleep;
-        }
-      });
-      this.weekType.forEach(typeWeek => {
-        if (weekType === this.selectedWeekType) {
-          this.weekParam.weekType = weekType;
+        if (sleepMax === this.selectedMaxSleep) {
+          this.weekParam.maxSleep = sleepMax;
         }
       });
+      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.regionId = this.weekParam.region.id;
+      this.weekParam.agentId = this.week.agentId;
+      this.weekParam.bankedWith = this.week.bankedWith;
+      this.weekParam.owner = this.week.owner;
+      parseFloat(this.weekParam.sellPrice);
+      parseFloat(this.weekParam.levyAmount);
+      delete this.weekParam.weekType;
+      delete this.weekParam.Owner;
+      delete this.weekParam.agency;
+      delete this.weekParam.agent;
+      delete this.status;
       console.log(this.weekParam);
       this.editSave(this.weekParam);
     },

src/components/admin/status/timeshareAdminPage.vue

@@ -57,7 +57,7 @@
         <div class="col">
           <button style="float:right" class="btn-solid-blue" type="button">Filter</button>
         </div>
-      </div> -->
+      </div>-->
       <div class="row">
         <div class="col-md-12">
           <ListView
@@ -87,7 +87,7 @@
           {{ ButtonMessage }}
         </button> 
         <div>{{ Message }}</div>
-      </div> -->
+      </div>-->
     </div>
   </main>
 </template>
@@ -104,7 +104,7 @@ export default {
   data() {
     return {
       user: Log.getUser(),
-      selectedItems: [],
+      // selectedItems: [],
       showMessage: false,
       region: ""
     };
@@ -114,7 +114,12 @@ export default {
     this.initTimeshare(0);
   },
   computed: {
-    ...mapState("timeshare", ["resorts", "regions", "seasons", "detailedRegion"]),
+    ...mapState("timeshare", [
+      "resorts",
+      "regions",
+      "seasons",
+      "detailedRegion"
+    ]),
     ...mapState("individual", ["indiv"]),
     filteredResort() {
       let list = [];
@@ -166,7 +171,12 @@ export default {
   methods: {
     ...mapActions("myWeeks", ["getItems", "verifyWeek"]),
     ...mapActions("alert", ["success"]),
-    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
+    ...mapActions("timeshare", [
+      "initTimeshare",
+      "onResortChange",
+      "saveWeek",
+      "getBlankWeek"
+    ]),
     onVerify() {
       if (this.selectedItems.length > 0) {
         for (const i in this.selectedItems) {
@@ -184,7 +194,7 @@ export default {
       this.selectedItems = items;
     },
     onEdit(item) {
-      this.$router.push({ name: 'EditTimeshare', params: { weekParam: item } });
+      this.$router.push({ name: "EditTimeshare", params: { weekParam: item } });
       // this.$router.push(`/editTimeShare/${item.id}`);
     },
     onClearSelected() {

src/components/timeshare/sell/contentSection.vue

@@ -18,9 +18,11 @@
                   :checked="refAgent"
                   @change="changeRef"
                 />
-                <label class="custom-control-label" for="customSwitch1">{{
+                <label class="custom-control-label" for="customSwitch1">
+                  {{
                   refAgent ? "Yes" : "No"
-                }}</label>
+                  }}
+                </label>
                 <div class="refbyAgent" :class="{ 'refbyAgent--clicked': refAgent }">
                   <div class="col-md-6" v-if="refAgent">
                     <label for="Name of Agency">Agency</label>
@@ -30,9 +32,11 @@
                       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">
@@ -64,9 +68,11 @@
             <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"
@@ -75,9 +81,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>
+                        }}
+                      </option>
                     </select>
                   </float-label>
                 </div>
@@ -95,9 +103,11 @@
               </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"
@@ -106,9 +116,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>
+                        }}
+                      </option>
                     </select>
                   </float-label>
                 </div>
@@ -194,9 +206,7 @@
                 <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"
@@ -211,9 +221,7 @@
                 <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"
@@ -243,9 +251,7 @@
                 <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"
@@ -273,17 +279,20 @@
                   :checked="sellItem.currentYearBanked"
                   @change="changeCurrentBanked"
                 />
-                <label class="custom-control-label" for="customSwitch2">{{
+                <label class="custom-control-label" for="customSwitch2">
+                  {{
                   sellItem.currentYearBanked ? "Yes" : "No"
-                }}</label>
+                  }}
+                </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"
@@ -373,9 +382,11 @@
               <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%">
@@ -386,9 +397,7 @@
                     >
                       <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>
@@ -635,9 +644,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>
@@ -655,9 +664,11 @@
                     :checked="sellItem.leviesPaidInFull"
                     @change="changeLeviesPaidInFull"
                   />
-                  <label class="custom-control-label" for="customSwitch3">{{
+                  <label class="custom-control-label" for="customSwitch3">
+                    {{
                     sellItem.leviesPaidInFull ? "Yes" : "No"
-                  }}</label>
+                    }}
+                  </label>
                 </div>
                 <div class="validation"></div>
               </div>
@@ -676,9 +687,11 @@
                     :checked="sellItem.weekPlacedForRental"
                     @change="changeWeekPlacedForRental"
                   />
-                  <label class="custom-control-label" for="customSwitch4">{{
+                  <label class="custom-control-label" for="customSwitch4">
+                    {{
                     sellItem.weekPlacedForRental ? "Yes" : "No"
-                  }}</label>
+                    }}
+                  </label>
                 </div>
                 <div class="validation"></div>
               </div>
@@ -799,14 +812,12 @@
               </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">
               <button class="btn-solid-blue" @click="paygateRedirect()">PayGate</button>
-            </div> -->
+            </div>-->
             <br />
             <br />
           </div>
@@ -884,7 +895,11 @@ 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
         );
@@ -912,7 +927,11 @@ 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;
@@ -922,7 +941,12 @@ export default {
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
-    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
+    ...mapActions("timeshare", [
+      "initTimeshare",
+      "onResortChange",
+      "saveWeek",
+      "getBlankWeek"
+    ]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
     newSale() {
@@ -933,10 +957,11 @@ export default {
       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");
+        console.log(this.sellItem);
+        //   this.saveWeek(this.sellItem).then(fulfilled => {
+        //     this.paygateRedirect();
+        //   });
+      }
     },
     paygateRedirect() {
       var amount = this.getListingFee.amount;
@@ -992,7 +1017,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;