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

src/components/timeshare/buy/searchResults.vue

@@ -44,6 +44,7 @@
     </div>
     <div v-else class="row">
       <div align="center" class="col-md-12">
+        <br />
         <img src="img/no-homes.png" />
         <br />
         <br />

src/components/timeshare/buy/searchSection.vue

@@ -42,60 +42,6 @@
               <option disabled>Please Select a Region First</option>
             </select>
           </div>
-          <!-- <div class="input-group my-1">
-            <label v-if="selectedSeason === null" class="uniSelectLabel" for="season">Season</label>
-            <select
-              class="form-control uniSelect"
-              name="season"
-              id="season"
-              v-model="selectedSeason"
-            >
-              <option v-for="season in seasons" :key="season.id" :value="season">{{ season.name }}</option>
-            </select>
-          </div>
-
-          <input
-            type="number"
-            name="bedrooms"
-            class="form-control my-1"
-            id="bedrooms"
-            placeholder="Bedrooms"
-            v-model="bedrooms"
-            @input="checkValueBedrooms()"
-          />
-
-          <input
-            type="number"
-            name="max-price"
-            class="form-control my-1"
-            id="max-price"
-            placeholder="Maximum Price"
-            v-model="maxPrice"
-            @input="checkValuePrice()"
-          />
-
-          <p>
-            Filter Arrival Date from
-            <input
-              type="date"
-              name="arrival-from"
-              class="form-control my-1"
-              id="arrival-from"
-              placeholder="mm/dd/yy"
-              v-model="dateFrom"
-            />
-          </p>
-          <p>
-            Filter Arrival Date to
-            <input
-              type="date"
-              name="arrival-to"
-              class="form-control my-1"
-              id="arrival-to"
-              placeholder="mm/dd/yy"
-              v-model="dateTo"
-            />
-          </p>-->
           <button class="btn-white-border" @click="ShowResort()">
             <i class="fa fa-search"></i> SEARCH
           </button>
@@ -112,7 +58,7 @@
               <iframe
                 :src="mapUrl"
                 width="100%"
-                height="600"
+                height="400"
                 frameborder="0"
                 style="border-radius:10px"
                 allowfullscreen

src/components/timeshare/buy/weekListComponent.vue

@@ -4,12 +4,16 @@
       <table class="table table-striped table-responsive">
         <thead>
           <tr>
-            <th scope="col">Reference</th>
+            <th scope="col">Ref</th>
             <th scope="col">Unit</th>
             <th scope="col">Module</th>
+            <th scope="col">Arrival</th>
+            <th scope="col">Departure</th>
             <th scope="col">Bedrooms</th>
             <th scope="col">Season</th>
+            <th scope="col">Type</th>
             <th scope="col">Price Incl VAT</th>
+            <th scope="col">Status</th>
             <th scope="col">Interested?</th>
           </tr>
         </thead>
@@ -18,9 +22,16 @@
             <td>#{{ item.id }}</td>
             <td>{{ item.unitNumber }}</td>
             <td>{{ item.weekNumber }}</td>
+            <td v-if="item.arrivalDate === '0001-01-01T00:00:00'"></td>
+            <td v-else>{{ item.arrivalDate | toDate }}</td>
+            <td v-if="item.departureDate === '0001-01-01T00:00:00'"></td>
+            <td v-else>{{ item.departureDate | toDate }}</td>
             <td>{{ item.bedrooms }}</td>
             <td>{{ item.season }}</td>
+            <td>{{ item.weekType }}</td>
             <td>{{ item.sellPrice | toCurrency }}</td>
+            <td v-if="item.status">{{ item.status.display }}</td>
+            <td v-else></td>
             <!-- <td>{{ item.region ? item.region.regionName : "" }}</td>
             <td>{{ item.resort ? item.resort.resortName : "" }}</td>
 
@@ -68,15 +79,15 @@ import { mapState, mapActions, mapGetters } from "vuex";
 export default {
   props: {
     resortCode: undefined,
-    userId: undefined
+    userId: undefined,
   },
   components: {},
   computed: {
     ...mapState("weekList", ["weeks", "status"]),
     ...mapGetters({
       filteredWeeks: "weekList/filteredWeeks",
-      getRegions: "weekList/getRegions"
-    })
+      getRegions: "weekList/getRegions",
+    }),
   },
   mounted() {
     if (this.resortCode) {
@@ -88,8 +99,8 @@ export default {
     View(item) {
       this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
     },
-    ...mapActions("weekList", ["getWeeks", "applyResortFilter"])
-  }
+    ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
+  },
 };
 </script>
 

src/components/timeshare/resort/contentSection.vue

@@ -2,7 +2,7 @@
   <section>
     <div class="container">
       <div class="row" id="resort-profile">
-        <div class="col-md-4">
+        <div class="col-md-3">
           <img src="img/listings/property1/property1-gallery.jpg" class="img-fluid" alt />
           <div class="row no-gutters">
             <div class="col-6">
@@ -15,7 +15,7 @@
           <gallerySection :images="images" />
           <FilterComponent :hideTop="true" />
         </div>
-        <div class="col-md-8 p-5 resort-profile">
+        <div class="col-md-9 p-5 resort-profile">
           <h2>{{ resort.prName }}</h2>
           <WeekList :resortCode="resortCode" />
           <p>{{ resort.prNotes }}</p>

src/components/timeshare/sell/contentSection.vue

@@ -18,9 +18,10 @@
                   :checked="refAgent"
                   @change="changeRef"
                 />
-                <label class="custom-control-label" for="customSwitch1">
-                  {{ refAgent ? "Yes" : "No" }}
-                </label>
+                <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>
@@ -30,9 +31,11 @@
                       name="agency"
                       v-model="sellItem.agencyId"
                     >
-                      <option v-for="(item, i) in agencies" :key="i" :value="item.id">{{
+                      <option v-for="(item, i) in agencies" :key="i" :value="item.id">
+                        {{
                         item.agencyName
-                      }}</option>
+                        }}
+                      </option>
                     </select>
                   </div>
                   <div class="col-md-6" v-if="refAgent">
@@ -64,9 +67,11 @@
             <div class="form-row">
               <div class="form-group col-md-6">
                 <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>
 
                   <select
                     id="weekInfoRegionSelect"
@@ -75,9 +80,11 @@
                     @change="regionChange()"
                     style="font-size: 15px"
                   >
-                    <option v-for="(region, r) in regions" :key="r" :value="region">
-                      {{ region.regionName }}
-                    </option>
+                    <option
+                      v-for="(region, r) in regions"
+                      :key="r"
+                      :value="region"
+                    >{{ region.regionName }}</option>
                   </select>
                 </div>
 
@@ -94,9 +101,11 @@
               </div>
               <div class="form-group col-md-6">
                 <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>
 
                   <select
                     id="weekInfoResortSelect"
@@ -105,9 +114,11 @@
                     @change="resortChange()"
                   >
                     <option value="Other">Other</option>
-                    <option v-for="(resort, r) in filteredResort" :key="r" :value="resort">
-                      {{ resort.resortName }}
-                    </option>
+                    <option
+                      v-for="(resort, r) in filteredResort"
+                      :key="r"
+                      :value="resort"
+                    >{{ resort.resortName }}</option>
                   </select>
                 </div>
                 <!-- <input
@@ -184,9 +195,7 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region"
-                  >BEDROOM/S</label
-                >
+                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region">BEDROOM/S</label>
 
                 <select
                   class="form-control uniSelect"
@@ -199,9 +208,7 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region"
-                  >SLEEP MAX</label
-                >
+                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region">SLEEP MAX</label>
 
                 <select
                   class="form-control uniSelect"
@@ -225,6 +232,20 @@
                 />
                 <div class="validation"></div>
               </div>
+              <div class="form-group col-md-6">
+                <label v-if="!sellItem.weekType" class="uniSelectLabel" for="region">WEEK TYPE</label>
+                <select
+                  class="form-control uniSelect"
+                  name="region"
+                  id="region"
+                  v-model="sellItem.weekType"
+                >
+                  <option :key="0">Flexi</option>
+                  <option :key="1">Fixed</option>
+                  <option :key="2">Module</option>
+                  <option :key="3">Syndicate</option>
+                </select>
+              </div>
             </div>
           </div>
           <div align="left" class="custom-control custom-switch mb-2">
@@ -238,17 +259,19 @@
                   :checked="sellItem.currentYearBanked"
                   @change="changeCurrentBanked"
                 />
-                <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 }"
                 >
                   <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"
@@ -482,8 +505,7 @@
                     v-if="!indiv.bankingDetails.bank"
                     class="uniSelectLabel"
                     for="weekInfoRegionSelect"
-                    >BANK</label
-                  >
+                  >BANK</label>
 
                   <select
                     id="weekInfoRegionSelect"
@@ -492,9 +514,7 @@
                     style="font-size: 15px"
                     v-model="indiv.bankingDetails.bank"
                   >
-                    <option v-for="bank in banks" :key="bank.id" :value="bank">
-                      {{ bank.name }}
-                    </option>
+                    <option v-for="bank in banks" :key="bank.id" :value="bank">{{ bank.name }}</option>
                   </select>
                 </div>
                 <div class="validation"></div>
@@ -539,9 +559,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>
@@ -559,9 +579,10 @@
                     :checked="sellItem.leviesPaidInFull"
                     @change="changeLeviesPaidInFull"
                   />
-                  <label class="custom-control-label" for="customSwitch3">
-                    {{ sellItem.leviesPaidInFull ? "Yes" : "No" }}
-                  </label>
+                  <label
+                    class="custom-control-label"
+                    for="customSwitch3"
+                  >{{ sellItem.leviesPaidInFull ? "Yes" : "No" }}</label>
                 </div>
                 <div class="validation"></div>
               </div>
@@ -580,9 +601,10 @@
                     :checked="sellItem.weekPlacedForRental"
                     @change="changeWeekPlacedForRental"
                   />
-                  <label class="custom-control-label" for="customSwitch4">
-                    {{ sellItem.weekPlacedForRental ? "Yes" : "No" }}
-                  </label>
+                  <label
+                    class="custom-control-label"
+                    for="customSwitch4"
+                  >{{ sellItem.weekPlacedForRental ? "Yes" : "No" }}</label>
                 </div>
                 <div class="validation"></div>
               </div>
@@ -700,15 +722,11 @@
               </div>
             </div>
             <div class="text-center col-12">
-              <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>
+              <button class="btn-solid-blue" @click="paygateRedirect()">PayGate</button>
             </div>
             <br />
             <br />
@@ -734,18 +752,18 @@ export default {
   name: "TimeshareToSell",
   props: {
     weekId: {
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
       wait: false,
-      userLoggedIn: Log.isLoggedIn()
+      userLoggedIn: Log.isLoggedIn(),
     };
   },
   components: {
     addressAutoComplete,
-    Alert
+    Alert,
   },
   mounted() {
     if (this.sellItem.id) {
@@ -771,13 +789,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() {
@@ -785,9 +803,14 @@ export default {
     },
     filteredResort() {
       let list = [];
-      if (this.sellItem && this.sellItem.region && this.sellItem.region.regionCode) {
+      if (
+        this.sellItem &&
+        this.sellItem.region &&
+        this.sellItem.region.regionCode
+      ) {
         const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.sellItem.region.regionCode
+          (region) =>
+            region.region.regionCode === this.sellItem.region.regionCode
         );
         if (item) {
           list = item.children;
@@ -795,14 +818,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);
@@ -810,11 +833,16 @@ export default {
         }
       });
       return notDeletedArr;
-    }
+    },
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
-    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
+    ...mapActions("timeshare", [
+      "initTimeshare",
+      "onResortChange",
+      "saveWeek",
+      "getBlankWeek",
+    ]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
     newSale() {
@@ -824,11 +852,11 @@ export default {
     submitSale() {
       if (this.userLoggedIn) {
         this.sellItem.ownerObject = this.indiv;
-        console.log(this.sellItem);
-
-        this.saveWeek(this.sellItem).then(fulfilled => {
-          this.paygateRedirect();
-        });
+        this.sellItem.status = undefined;
+        console.log(JSON.stringify(this.sellItem));
+        //   this.saveWeek(this.sellItem).then((fulfilled) => {
+        //     this.paygateRedirect();
+        //   });
       } else this.$router.push("/user/login");
     },
     paygateRedirect() {
@@ -838,16 +866,16 @@ export default {
         creatydById: Log.getUser().id, //Log.getUser().id,
         amount: 380.0,
         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,
+          },
         });
       });
     },
@@ -872,7 +900,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") {
@@ -884,7 +912,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;
@@ -893,8 +923,8 @@ export default {
       this.indiv.address.city = address.city;
       this.indiv.address.suburb = address.suburb;
       this.indiv.address.postalCode = address.postalCode;
-    }
-  }
+    },
+  },
 };
 </script>