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

public/css/newStyle.css

@@ -132,6 +132,9 @@ a:focus {
 p {
   padding: 0;
   margin: 0 0 20px 0;
+}
+
+ql-align-center {
   text-align: center;
 }
 
@@ -273,7 +276,7 @@ h3 {
 .modal-dialog {
   position: fixed;
   margin: auto;
-  width: 320px;
+  width: 520px;
   right: 0px;
   height: 100%;
 }

src/components/about/aboutTimeshareContentSection.vue

@@ -52,7 +52,9 @@
       <div class="row" data-aos="fade-down">
         <div class="col-lg-12">
           <h3>
-            Uni-Vate Properties facilitates the timeshare resale for a listing fee of only R380
+            Uni-Vate Properties facilitates the timeshare resale for a listing fee of only R{{
+              getListingFee.amount
+            }}
             including VAT payable when listing your week/module.
           </h3>
           <br />
@@ -65,9 +67,14 @@
 <script>
 import AOS from "aos";
 import "aos/dist/aos.css";
+import { mapGetters } from "vuex";
+
 export default {
   created() {
     AOS.init();
+  },
+  computed: {
+    ...mapGetters("fees", ["getListingFee"])
   }
 };
 </script>

src/components/about/aboutUsCarouselSection.vue

@@ -7,7 +7,7 @@
             <h2>About Us</h2>
             <p>
               Uni-Vate Properties began in 2013 in Pretoria East with various properties in their
-              portfolio. Led by our Director, Delia 0' Conner, who has over 25 years of experience
+              portfolio. Led by our Director, Delia O' Conner, who has over 25 years of experience
               in the timeshare industry, the move to conventional property sales and rentals was an
               easy transition for the Uni-Vate team.
             </p>

src/components/about/aboutUsContentSection.vue

@@ -23,9 +23,11 @@
           </p>
           <p>
             <strong
-              >Sellers across SA are able to list properties for a listing fee of R380 per property
-              listing which gives them exposure not only on the website, but on social media sites
-              also.</strong
+              >Sellers across SA are able to list properties for a listing fee of R{{
+                getListingFee.amount
+              }}
+              per property listing which gives them exposure not only on the website, but on social
+              media sites also.</strong
             >
           </p>
           <p>
@@ -58,9 +60,14 @@
 <script>
 import AOS from "aos";
 import "aos/dist/aos.css";
+import { mapGetters } from "vuex";
+
 export default {
   created() {
     AOS.init();
+  },
+  computed: {
+    ...mapGetters("fees", ["getListingFee"])
   }
 };
 </script>

src/components/admin/misc/termsConditions.vue

@@ -56,7 +56,7 @@ export default {
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
-        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
+
         [{ list: "ordered" }, { list: "bullet" }, { list: "check" }],
         [{ script: "sub" }, { script: "super" }],
         [{ indent: "-1" }, { indent: "+1" }]

src/components/admin/status/editTimeShareAdminPage.vue

@@ -13,7 +13,6 @@
                 <div align="center" class="col"></div>
               </div>
             </div>
-
             <div class="form">
               <div id="sendmessage">Your details has been sent. Thank you!</div>
               <div id="errormessage"></div>
@@ -113,7 +112,7 @@
                       name="week"
                       id="week"
                       placeholder="UNIT / WEEK NUMBER"
-                      v-model="weekParam.weekNumber"
+                      v-model="week.module"
                       data-msg="Please enter week number"
                     />
                   </float-label>
@@ -218,16 +217,16 @@
                   <div class="validation"></div>
                 </div>
                 <div class="form-group col-md-6 mt-2">
-                  <label v-if="!weekParam.askingPrice" for="tsaPrice" class="uniSelectLabel"
+                  <label v-if="!week.askingPrice" for="tsaPrice" class="uniSelectLabel"
                     >ASKING PRICE</label
                   >
                   <float-label label="ASKING PRICE">
                     <currency-input
                       onclick="this.setSelectionRange(0, this.value.length)"
                       name="tsaPrice"
-                      :value="weekParam.askingPrice"
-                      @input="weekParam.askingPrice = $event"
-                      v-model="weekParam.askingPrice"
+                      :value="week.askingPrice"
+                      @input="week.askingPrice = $event"
+                      v-model="week.askingPrice"
                       id="resPrice"
                       class="form-control uniInput"
                     />
@@ -404,7 +403,7 @@
                       id="landline"
                       placeholder="Landline Number"
                       data-msg="Please enter your landline number"
-                      v-model="week.owner.landlineNumber"
+                      v-model="week.owner.telephone"
                     />
                   </float-label>
 
@@ -530,6 +529,8 @@ export default {
     this.getIndividual(Log.getUser().id);
     this.getBanks();
     //this.getWeek(this.weekParam.id);
+    console.log(this.regions);
+    console.log(this.weekParam.region.regionCode);
     this.selectedRegion = this.weekParam.region.regionCode;
     this.selectedResort = this.weekParam.resort.resortCode;
     this.selectedBedrooms = this.weekParam.bedrooms;
@@ -575,9 +576,9 @@ export default {
     },
     filteredResort() {
       let list = [];
-      if (this.sellItem && this.sellItem.region && this.sellItem.region.regionCode) {
+      if (this.week && this.week.region && this.selectedRegion) {
         const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.sellItem.region.regionCode
+          region => region.region.regionCode === this.selectedRegion
         );
         if (item) {
           list = item.children;
@@ -604,11 +605,13 @@ export default {
     saveEdit() {
       this.regions.forEach(region => {
         if (region.regionCode === this.selectedRegion) {
-          this.weekParam.region = region;
+          //console.log(region);
+          this.weekParam.regionId = region.id;
         }
       });
       this.resorts.forEach(resort => {
         if (resort.resortCode === this.selectedResort) {
+          this.weekParam.resortCode = resort.resortCode;
           this.weekParam.resortName = resort.resortName;
         }
       });
@@ -630,13 +633,18 @@ export default {
       if (this.week.owner.cellNumber === "") {
         this.week.owner.cellNumber = "0000000000";
       }
+      if (this.week.owner.telephone === "") {
+        this.week.owner.telephone = "0000000000";
+      }
       this.weekParam.arrivalDate = new Date(this.dateParam).toISOString().substring(0, 10);
       this.weekParam.departureDate = new Date(this.depDateParam).toISOString().substring(0, 10);
       this.weekParam.pulbishedDate = new Date(this.pubDateParam).toISOString().substring(0, 19);
-      this.weekParam.regionId = this.weekParam.region.id;
+      //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;
+      this.weekParam.askingPrice = this.week.askingPrice;
+      this.weekParam.module = this.week.module;
       parseFloat(this.weekParam.sellPrice);
       parseFloat(this.weekParam.levyAmount);
       delete this.weekParam.weekType;
@@ -646,10 +654,10 @@ export default {
       delete this.status;
       delete this.weekParam.owner.howMarried;
       delete this.weekParam.cellNumber;
-      console.log(JSON.stringify(this.weekParam));
-      // this.editSave(this.weekParam).then(() => {
-      //   this.backToListView();
-      // });
+      //console.log(JSON.stringify(this.weekParam));
+      this.editSave(this.weekParam).then(() => {
+        this.backToListView();
+      });
     },
     resortChange() {
       this.onResortChange({

src/components/misc/TermsConditions/contentSection.vue

@@ -1,15 +1,18 @@
 <template>
-  <div class="container">
-    <div class="row">
-      <div class="col">
-        <div class="section-header">
-          <h2>Terms & Conditions</h2>
+  <div>
+    <div class="container" style="text-align:left">
+      <div class="row">
+        <div class="col">
+          <div class="section-header">
+            <h2>Terms & Conditions</h2>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="row">
-      <div class="col">
-        <div v-html="terms.termsConditions"></div>
+
+      <div class="row" style="text-align:left">
+        <div class="col" style="text-align:left">
+          <div v-html="terms.termsConditions" id="htmlContainer"></div>
+        </div>
       </div>
     </div>
   </div>

src/components/misc/bondCaclculator.vue

@@ -1,6 +1,15 @@
 <template>
   <div>
-    <h2 id="modal-bondcal">Bond Calculator</h2>
+    <iframe
+      id="better-bond-frame embed-responsive-item"
+      src="https://betterbond.co.za/calculators-in-frame6/home-loan-repayment"
+      title="Better Bond"
+      height="1340"
+      width="100%"
+      sandbox="allow-forms allow-scripts allow-same-origin"
+      scrolling="yes"
+    ></iframe>
+    <!-- <h2 id="modal-bondcal">Bond Calculator</h2>
     <p>Calculate the value of the property you could buy</p>
     <currency-input
       onClick="this.setSelectionRange(0, this.value.length)"
@@ -31,9 +40,9 @@
       id="interest"
       placeholder="Interest Rate (Percent)"
       v-model="rate"
-    />
+    /> -->
     <!-- <button @click="calculate()" class="btn-solid-blue scrollto">CALCULATE</button> -->
-    <div class="container p-0 mt-5">
+    <!-- <div class="container p-0 mt-5">
       <div class="row">
         <div class="col-md-7">
           Monthly Repayment
@@ -51,7 +60,7 @@
           <strong>{{ grossIncome | toCurrency }}</strong>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/misc/privacyPolicy/carouselSection.vue

@@ -8,7 +8,7 @@
             <p>
               We respect your privacy. This Privacy Policy governs the manner in which we will treat
               your personal information collected when using our website and when we otherwise
-              engage with each after you visiting our website.
+              engage with each after you visit our website.
             </p>
           </div>
         </div>

src/components/property/propertyCard.vue

@@ -11,7 +11,17 @@
             <router-link :to="`/property/residential/property/${currentProperty.id}`">
               <div class="portfolio-item p-4 wow fadeInUp justify-content-md-center">
                 <div class="feature-top pt-3 mb-2">
-                  <h3>{{ currentProperty.displayPrice }}</h3>
+                  <div class="pb-2">
+                    <h3 style="display:inline">{{ currentProperty.displayPrice }}</h3>
+                    <p
+                      v-if="!currentProperty.isSale"
+                      class="ml-1"
+                      style="display:inline; color:white"
+                    >
+                      Per Month
+                    </p>
+                  </div>
+
                   <div>
                     <img
                       style="height:165px; object-fit: cover;"
@@ -27,7 +37,15 @@
                 </p>
                 <p
                   v-if="currentProperty.displayText != ''"
-                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
+                  :class="[
+                    currentProperty.displayColor === 'green'
+                      ? 'greenText'
+                      : currentProperty.displayColor === 'orange'
+                      ? 'pendingOffer'
+                      : currentProperty.displayColor === 'red'
+                      ? 'redText'
+                      : 'normalText'
+                  ]"
                 >
                   <strong>{{ currentProperty.displayText }}</strong>
                 </p>
@@ -38,7 +56,16 @@
             <router-link :to="`/property/commercial/property/${currentProperty.id}`">
               <div class="portfolio-item p-4 wow fadeInUp justify-content-md-center">
                 <div class="feature-top pt-3 mb-2">
-                  <h3>{{ currentProperty.displayPrice }}</h3>
+                  <div class="pb-2">
+                    <h3 style="display:inline">{{ currentProperty.displayPrice }}</h3>
+                    <p
+                      v-if="!currentProperty.isSale"
+                      class="ml-1"
+                      style="display:inline; color:white"
+                    >
+                      Per Month
+                    </p>
+                  </div>
                   <img
                     style="height:165px; object-fit: cover;"
                     :src="currentProperty.displayImage"
@@ -52,7 +79,15 @@
                 </p>
                 <p
                   v-if="currentProperty.displayText != ''"
-                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
+                  :class="[
+                    currentProperty.displayColor === 'green'
+                      ? 'greenText'
+                      : currentProperty.displayColor === 'orange'
+                      ? 'pendingOffer'
+                      : currentProperty.displayColor === 'red'
+                      ? 'redText'
+                      : 'normalText'
+                  ]"
                 >
                   <strong>{{ currentProperty.displayText }}</strong>
                 </p>
@@ -73,7 +108,7 @@ export default {
   props: {
     properties: { type: Array, default: () => [] },
     showSort: { type: Boolean, default: true },
-    salesType: { type: String, default: "Rent" },
+    salesType: { type: String, default: "Rent" }
   },
   methods: {
     sortHighPrice() {
@@ -111,8 +146,8 @@ export default {
       }
 
       return this.properties.sort(compare);
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/shared/basePagination.vue

@@ -3,7 +3,7 @@
     <nav>
       <ul class="pagination">
         <li class="page-item" v-if="isPreviousButtonDisabled" @click="previousPage">
-          <a class="page-link" href="#" aria-label="Previous">
+          <a class="page-link" aria-label="Previous">
             <span aria-hidden="true">&laquo;</span>
             <span class="sr-only">Previous</span>
           </a>
@@ -16,7 +16,7 @@
           />
         </li>
         <li class="page-item" v-if="isNextButtonDisabled" @click="nextPage">
-          <a class="page-link" href="#" aria-label="Next">
+          <a class="page-link" aria-label="Next">
             <span aria-hidden="true">&raquo;</span>
             <span class="sr-only">Next</span>
           </a>
@@ -26,25 +26,25 @@
   </div>
 </template>
 <script>
-import BasePaginationItem from './basePaginationItem.vue';
+import BasePaginationItem from "./basePaginationItem.vue";
 
 export default {
   components: {
-    BasePaginationItem,
+    BasePaginationItem
   },
   props: {
     visiblePagesCount: {
       type: Number,
-      default: 5,
+      default: 5
     },
     currentPage: {
       type: Number,
-      required: true,
+      required: true
     },
     pageCount: {
       type: Number,
-      required: true,
-    },
+      required: true
+    }
   },
   computed: {
     isPreviousButtonDisabled() {
@@ -71,37 +71,37 @@ export default {
       if (currentPage <= visiblePagesThreshold + 1) {
         pagintationItemsArray[0] = 1;
         const pagintationItems = pagintationItemsArray.map(
-          (paginationTrigger, index) => pagintationItemsArray[0] + index,
+          (paginationTrigger, index) => pagintationItemsArray[0] + index
         );
         pagintationItems.push(pageCount);
         return pagintationItems;
       }
       if (currentPage >= pageCount - visiblePagesThreshold + 1) {
         const pagintationItems = pagintationItemsArray.map(
-          (paginationTrigger, index) => pageCount - index,
+          (paginationTrigger, index) => pageCount - index
         );
         pagintationItems.reverse().unshift(1);
         return pagintationItems;
       }
       pagintationItemsArray[0] = currentPage - visiblePagesThreshold + 1;
       const pagintationItems = pagintationItemsArray.map(
-        (paginationTrigger, index) => pagintationItemsArray[0] + index,
+        (paginationTrigger, index) => pagintationItemsArray[0] + index
       );
       pagintationItems.unshift(1);
       pagintationItems[pagintationItems.length - 1] = pageCount;
       return pagintationItems;
-    },
+    }
   },
   methods: {
     onLoadPage(value) {
-      this.$emit('loadPage', value);
+      this.$emit("loadPage", value);
     },
     nextPage() {
-      this.$emit('nextPage');
+      this.$emit("nextPage");
     },
     previousPage() {
-      this.$emit('previousPage');
-    },
-  },
+      this.$emit("previousPage");
+    }
+  }
 };
 </script>

src/components/shared/footerSection.vue

@@ -32,10 +32,10 @@
               ><br />
             </p>
           </div>
-          <div class="col-lg-9 section-header" id="contactFoot">
+          <div class="col-lg-4 section-header" id="contactFoot">
             <h2 align="left">Contact Us</h2>
             <div class="row">
-              <div class="col-md-4">
+              <div class="col-md-12">
                 <p class="footerText">
                   105 Lombardy Business Park<br />
                   Cnr. Graham and Cole Rd.<br />
@@ -44,18 +44,18 @@
                   ><br />
                   <a href="tel:0124921238">+27 (0) 12 492 1238</a>
                 </p>
-                <br /><br />
+                <br />
                 <p>
                   <a href="#body"
                     ><img src="../../../public/img/logos/UVProp.png" width="200px" alt="" title=""
                   /></a>
                 </p>
               </div>
-              <div class="col-md-8">
-                <contactUsSection />
-              </div>
             </div>
           </div>
+          <div class="col-lg-5 section-header" id="contactFoot">
+            <contactUsSection />
+          </div>
         </div>
       </div>
     </section>

src/components/timeshare/buy/weekListComponent.vue

@@ -18,7 +18,7 @@
           </tr>
         </thead>
         <tbody>
-          <tr v-for="(item, i) in filteredWeeks" :key="i">
+          <tr v-for="(item, i) in DisplayItems" :key="i">
             <td>#{{ item.id }}</td>
             <td>{{ item.unitNumber }}</td>
             <td>{{ item.weekNumber }}</td>
@@ -49,6 +49,29 @@
           </tr>
         </tbody>
       </table>
+      <div class="row">
+        <div class="col-md-2">
+          Items Per Page:
+          <select
+            class="form-control"
+            v-model="visibleItemsPerPageCount"
+            @change="onChangeItemsPerPage()"
+          >
+            <option v-for="(item, i) in visibleItemSelector" :key="i">{{ item }}</option>
+          </select>
+        </div>
+        <div class="col-md-10 mt-4">
+          <div style="float:right">
+            <BasePagination
+              :currentPage="currentPage"
+              :pageCount="PageCount"
+              @nextPage="pageChangeHandle('next')"
+              @previousPage="pageChangeHandle('previous')"
+              @loadPage="pageChangeHandle"
+            />
+          </div>
+        </div>
+      </div>
     </div>
     <div v-else>
       <div class="row">
@@ -73,34 +96,77 @@
 
 <script>
 /* eslint-disable */
-
+import BasePagination from "../../shared/basePagination";
 import { mapState, mapActions, mapGetters } from "vuex";
 
 export default {
   props: {
     resortCode: undefined,
     userId: undefined,
+    currentPage: {
+      default: 1
+    }
+  },
+  data() {
+    return {
+      visibleItemsPerPageCount: 8,
+      visibleItemSelector: [5, 8, 10, 20, 50, 100]
+    };
+  },
+  components: {
+    BasePagination
   },
-  components: {},
   computed: {
     ...mapState("weekList", ["weeks", "status"]),
     ...mapGetters({
       filteredWeeks: "weekList/filteredWeeks",
-      getRegions: "weekList/getRegions",
+      getRegions: "weekList/getRegions"
     }),
+    DisplayItems() {
+      const list = this.filteredWeeks;
+      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount;
+      let endSlice = this.currentPage * this.visibleItemsPerPageCount;
+      if (endSlice > list.length) {
+        endSlice = list.length;
+      }
+      return list.slice(startSlice, endSlice);
+    },
+    PageCount() {
+      return this.visibleItemsPerPageCount !== 0
+        ? Math.ceil(this.filteredWeeks.length / this.visibleItemsPerPageCount)
+        : 1;
+    }
   },
   mounted() {
     if (this.resortCode) {
       this.applyResortFilter(this.resortCode);
     }
-    this.getWeeks();
+    this.getByResortCode(this.$route.params.resortCode);
+    //this.getWeeks();
   },
   methods: {
+    ...mapActions("weekList", ["getWeeks", "applyResortFilter", "getByResortCode"]),
     View(item) {
       this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
     },
-    ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
-  },
+    onChangeItemsPerPage() {
+      if (this.currentPage !== 1) {
+        this.currentPage = 1;
+      }
+    },
+    async pageChangeHandle(value) {
+      switch (value) {
+        case "next":
+          this.currentPage += 1;
+          break;
+        case "previous":
+          this.currentPage -= 1;
+          break;
+        default:
+          this.currentPage = value;
+      }
+    }
+  }
 };
 </script>
 

src/components/timeshare/resort/contentSection.vue

@@ -17,6 +17,7 @@
         </div>
         <div class="col-md-9 p-5 resort-profile">
           <h2>{{ resort.prName }}</h2>
+          {{ resort }}
           <WeekList :resortCode="resortCode" />
           <p>{{ resort.prNotes }}</p>
           <div class="d-flex mt-3">
@@ -54,13 +55,13 @@ import gallerySection from "./gallerySection";
 
 export default {
   props: {
-    resortCode: {},
+    resortCode: {}
   },
   components: {
     WeekList,
     FilterComponent,
     ResortImages,
-    gallerySection,
+    gallerySection
   },
   // async mounted() {
   //   await this.initResort(this.resortCode);
@@ -69,7 +70,7 @@ export default {
   data() {
     return {
       index: null,
-      boolLoaded: false,
+      boolLoaded: false
     };
   },
   computed: {
@@ -80,14 +81,14 @@ export default {
       return this.resort
         ? `http://maps.google.com/maps?q=${this.resort.prLatitude},${this.resort.prLongitude}&z=15&output=embed`
         : "";
-    },
+    }
   },
   methods: {
     ...mapActions("resort", ["GetResortData"]),
     routerGoTo(goto) {
       this.$router.push(goto);
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/timeshare/resort/resortPageNew.vue

@@ -3,39 +3,29 @@
     <carouselSection v-if="!wait" :resortImages="resort.images" />
     <main id="main" style="margin-top:-20px;">
       <section>
-        <div class="container wider">
+        <div class="container">
           <div class="row" id="resort-profile">
             <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">
-                  <img src="img/listings/property1/property1-gallery.jpg" class="img-fluid" alt />
-                </div>
-                <div class="col-6">
-                  <img src="img/listings/property1/property1-gallery.jpg" class="img-fluid" alt />
-                </div>
-              </div>
               <gallerySection :images="resort.images" />
               <FilterComponent :hideTop="true" />
             </div>
-            <div class="col-md-9 resort-profile" style="margin-top:15px; margin-bottom:15px;">
+            <div class="col resort-profile" style="margin-top:15px; margin-bottom:15px;">
               <h2>{{ resort.prName }}</h2>
               <WeekList :resortCode="resortCode" />
               <p v-if="resort.description && resort.description !== ''">{{ resort.description }}</p>
               <br v-if="resort.description && resort.description !== ''" />
-              <p>{{ resort.prNotes }}</p>
               <div class="d-flex mt-3">
                 <iframe
                   width="100%"
                   height="200"
                   id="gmap_canvas"
                   :src="
-                'https://maps.google.com/maps?q=' +
-                  resort.prLatitude +
-                  ',' +
-                  resort.prLongitude +
-                  '&hl=en&z=14&amp;output=embed'
-              "
+                    'https://maps.google.com/maps?q=' +
+                      resort.prLatitude +
+                      ',' +
+                      resort.prLongitude +
+                      '&hl=en&z=14&amp;output=embed'
+                  "
                   frameborder="0"
                   scrolling="no"
                   marginheight="0"
@@ -44,6 +34,13 @@
               </div>
             </div>
           </div>
+          <div class="row">
+            <div class="col">
+              <router-link style="float:right" class="btn-solid-blue mb-4" to="/timeshare/buy"
+                >BACK</router-link
+              >
+            </div>
+          </div>
         </div>
       </section>
     </main>
@@ -66,39 +63,33 @@ export default {
     WeekList,
     FilterComponent,
     ResortImages,
-    gallerySection,
+    gallerySection
   },
   data() {
     return {
-      wait: false,
+      wait: true
     };
   },
   props: {
-    resortCode: {},
+    resortCode: {}
   },
   methods: {
     ...mapActions("resort", ["getResortData"]),
     routerGoTo(goto) {
       this.$router.push(goto);
-    },
+    }
   },
   computed: {
-    ...mapState("resort", ["resort"]),
-  },
-  mounted() {
-    this.wait = true;
-    this.getResortData(this.resortCode).then((fulfilled) => {
-      this.wait = false;
-    });
-    // .then(() => {
-    //   setTimeout(() => (this.boolLoaded = true), 2000);
-    // });
+    ...mapState("resort", ["resort"])
   },
+  created() {
+    this.getResortData(this.resortCode).then(() => (this.wait = false));
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-.wider {
-  width: 1600px;
+.container {
+  max-width: 1400px;
 }
 </style>

src/components/timeshare/sell/contentSection.vue

@@ -937,6 +937,8 @@ export default {
         this.saveWeek(this.sellItem).then(fulfilled => {
           this.paygateRedirect();
         });
+      } else {
+        this.$router.push("/user/login");
       }
     },
     paygateRedirect() {

src/store/modules/timeshare/myWeeks.js

@@ -71,7 +71,7 @@ export default {
       await axios
         .get(`/api/timeshareweek/${id}`)
         .then(r => {
-          console.log(JSON.stringify(r));
+          //console.log(JSON.stringify(r));
           commit("setItem", r.data);
         })
         .catch(console.error);

src/store/modules/timeshare/resort.js

@@ -136,16 +136,14 @@ export default {
         )
         .then(result => commit("setResortMedia", result.data));
     },
-    getResortData({ commit }, resortCode) {
-      return new Promise((resolve, reject) => {
-        axios
-          .get(`/api/resort/GetResortData/${resortCode}`)
-          .then(result => {
-            commit("setResort", result.data);
-            resolve();
-          })
-          .catch(error => reject(new Error(error.message)));
-      });
+    async getResortData({ commit }, resortCode) {
+      await axios
+        .get(`/api/resort/GetResortData/${resortCode}`)
+        .then(result => {
+          console.log(result.data);
+          commit("setResort", result.data);
+        })
+        .catch(error => console.log(new Error(error.message)));
     }
   }
 };

src/store/modules/timeshare/weekList.js

@@ -2,6 +2,7 @@
 /* eslint-disable eqeqeq */
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
+/* eslint-disable */
 import axios from "axios";
 import _, { min } from "lodash";
 
@@ -140,12 +141,20 @@ export default {
         resortCode
       });
     },
-    async getWeeks({ commit, rootGetters }) {
+    async getByResortCode({ commit }, resortCode) {
       commit("onLoading");
-      return axios
+      await axios.get("/api/timeshareweek/getByResortCode/" + resortCode).then(result => {
+        commit("setWeeks", result.data);
+        console.log(result);
+      });
+    },
+    async getWeeks({ commit, rootGetters }) {
+      //commit("onLoading");
+      await axios
         .get("/api/timeshareweek")
         .then(result => {
           const arr2 = result.data.filter(x => x.region !== null);
+          console.log(arr2);
           const arr3 = result.data.filter(x => x.region === null);
           for (const item in arr3) {
             const myItem = arr3[item];
@@ -160,8 +169,8 @@ export default {
               };
             }
           }
+          console.log(arr3);
           commit("setWeeks", arr2);
-          return Promise.resolve(arr2);
         })
         .catch(console.error);
     },