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

src/components/admin/status/editTimeShareAdminPage.vue

@@ -1,19 +1,63 @@
 <template>
-<main id="main">
-  <section id="contact2">
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-12">
-          <div class="section-header">
-            <h2>Week Information</h2>
-          </div>
-
-          <div align="left" class="custom-control custom-switch mb-2">
-            <div class="row">
-              <div align="center" class="col">
+  <main id="main">
+    <section id="contact2">
+      <div class="container">
+        <div class="row">
+          <div class="col-lg-12">
+            <div class="section-header">
+              <h2>Week Information</h2>
+            </div>
+            {{ weekParam }}
+            <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>
-          </div>
 
           <div class="form">
             <div id="sendmessage">Your details has been sent. Thank you!</div>
@@ -26,7 +70,6 @@
                     >REGION</label
                   >
                   <select
-                    id="weekInfoRegionSelect"
                     class="form-control uniSelect"
                     v-model="selectedRegion"
                     style="font-size: 15px"
@@ -35,6 +78,7 @@
                       region.regionName
                     }}</option>
                   </select>
+                  <div class="validation"></div>
                 </div>
                 <div class="validation"></div>
               </div>
@@ -45,7 +89,6 @@
                   >
 
                   <select
-                    id="weekInfoResortSelect"
                     class="form-control uniSelect"
                     v-model="selectedResort"
                   >
@@ -54,6 +97,7 @@
                       resort.resortName
                     }}</option>
                   </select>
+                  <div class="validation"></div>
                 </div>
                 <div class="validation"></div>
               </div>
@@ -237,13 +281,24 @@
                     >
                     <select
                       class="form-control uniSelect"
-                      name="spacebankOwner"
-                      v-if="sellItem.currentYearBanked"
-                      v-model="sellItem.bankedWith"
+                      id="howMarried"
+                      v-model="indiv.howMarried"
                     >
-                      <option v-for="(item, i) in bankedEntities" :key="i">{{ item }}</option>
+                      <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>
             </div>
@@ -414,10 +469,8 @@
         <br />
         <br />
       </div>
-      <div v-if="wait" id="preloader"></div>
-    </div>
-  </section>
-</main>
+    </section>
+  </main>
 </template>
 
 <script>

src/components/admin/status/timeshareAdminPage.vue

@@ -10,7 +10,7 @@
           </div>
         </div>
       </div>
-      <div class="row">
+      <!-- <div class="row">
         <div class="col-md-3">
           <float-label label="REGION">
             <select
@@ -18,6 +18,7 @@
               class="form-control uniSelect"
               @change="regionChange()"
               style="font-size: 15px"
+              v-model="region"
             >
               <option v-for="(region, r) in regions" :key="r" :value="region">{{
                 region.regionName
@@ -33,7 +34,7 @@
               @change="resortChange()"
             >
               <option value="Other">Other</option>
-              <option v-for="(resort, r) in resorts" :key="r" :value="resort">{{
+              <option v-for="(resort, r) in filteredResort" :key="r" :value="resort">{{
                 resort.resortName
               }}</option>
             </select>
@@ -56,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
@@ -104,7 +105,8 @@ export default {
     return {
       user: Log.getUser(),
       selectedItems: [],
-      showMessage: false
+      showMessage: false,
+      region: ""
     };
   },
   mounted() {
@@ -112,13 +114,13 @@ export default {
     this.initTimeshare(0);
   },
   computed: {
-    ...mapState("timeshare", ["resorts", "regions", "seasons"]),
+    ...mapState("timeshare", ["resorts", "regions", "seasons", "detailedRegion"]),
     ...mapState("individual", ["indiv"]),
     filteredResort() {
       let list = [];
-      if (this.sellItem && this.sellItem.region && this.sellItem.region.regionCode) {
+      if (this.region) {
         const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.sellItem.region.regionCode
+          region => region.region.regionCode === this.region.regionCode
         );
         if (item) {
           list = item.children;

src/components/processFlow/makeOffer.vue

@@ -10,7 +10,9 @@
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
         data-dismiss="modal"
-      >OK</button>
+      >
+        OK
+      </button>
     </div>
     <div v-else>
       <div v-if="!isSaved">
@@ -78,30 +80,39 @@
             ></textarea>
           </div>
         </div>
+        <div class="form-group row">
+          <div class="col-md-12">
+            <p>
+              *Occupation for the current year is not guaranteed, Uni-Vate Properties will confirm
+              upon reply.
+            </p>
+          </div>
+        </div>
       </div>
       <div v-if="!isSaved" class="container">
         <div class="row">
           <div algin="center" class="col">
-            <button
-              v-if="isMakeOffer"
-              type="button"
-              @click="SendOffer()"
-              class="btn-solid-blue"
-            >Send Offer</button>
+            <button v-if="isMakeOffer" type="button" @click="SendOffer()" class="btn-solid-blue">
+              Send Offer
+            </button>
             <button
               v-if="!isMakeOffer && !isDecline && canEdit"
               type="submit"
               @click="Accept()"
               class="btn btn-b-n"
               style="width: 150px; height:40px;"
-            >Accept</button>
+            >
+              Accept
+            </button>
             <button
               v-if="!isMakeOffer && !isDecline && canEdit"
               type="button"
               @click="Decline()"
               class="btn btn-b-n"
               style="width: 150px; height:40px;"
-            >Decline</button>
+            >
+              Decline
+            </button>
           </div>
         </div>
       </div>
@@ -123,7 +134,9 @@
         @click="Complete()"
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
-      >Complete</button>
+      >
+        Complete
+      </button>
       <div v-if="isSaved">
         <div class="form-group row">
           <br />
@@ -137,7 +150,9 @@
           class="btn btn-b-n"
           style="width: 150px; height:40px;"
           data-dismiss="modal"
-        >OK</button>
+        >
+          OK
+        </button>
       </div>
     </div>
   </div>
@@ -156,7 +171,7 @@ export default {
     canEdit: Boolean,
     item: Object,
     bidId: Number,
-    updateItem: Function,
+    updateItem: Function
   },
   data() {
     return {
@@ -164,7 +179,7 @@ export default {
       isSaved: false,
       message: "",
       isInfo: true,
-      isLoggedIn: Log.isLoggedIn(),
+      isLoggedIn: Log.isLoggedIn()
     };
   },
   methods: {
@@ -203,17 +218,17 @@ export default {
 
       const decline = {
         id: this.item.id,
-        comment: this.item.declineReason,
+        comment: this.item.declineReason
       };
 
       this.declineBid(decline);
       this.isSaved = true;
       this.message = "Offer Declined.";
       this.isInfo = false;
-    },
+    }
   },
   computed: {
-    ...mapState("bid", ["bidItem"]),
+    ...mapState("bid", ["bidItem"])
   },
   mounted() {
     this.getTemplate();
@@ -222,8 +237,8 @@ export default {
     item() {
       this.isSaved = false;
       this.canEdit = this.item.statusCode === "E1";
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/property/commercial/singleView/carouselSection.vue

@@ -16,7 +16,7 @@
           class="item"
           style="object-fit:cover"
           v-for="(image, i) in propertyImages"
-          :src="image"
+          :src="image.image"
           :key="i"
         />
       </carousel>

src/components/property/commercial/singleView/contentSection.vue

@@ -18,20 +18,20 @@
                 <img
                   v-if="i === 0"
                   style="width:100%; height:201px;object-fit: cover"
-                  :src="image"
+                  :src="image.image"
                 />
                 <div v-else-if="i !== 0">
                   <img
                     v-if="i % 2 === 0"
                     style="width:50%; height:140px; float:right;"
-                    :src="image"
+                    :src="image.image"
                   />
-                  <img v-else style="width:50%; height:140px; float:left" :src="image" />
+                  <img v-else style="width:50%; height:140px; float:left" :src="image.image" />
                 </div>
               </div>
             </div>
 
-            <gallery :images="propertyImages" :index="index" @close="index = null"></gallery>
+            <gallery :images="Images" :index="index" @close="index = null"></gallery>
           </div>
 
           <div class="panel-left p-5" style="margin-top:140px;">
@@ -41,7 +41,7 @@
             <div v-if="property.displayData.length > 0">
               <div v-for="(data, i) in property.displayData" :key="i">
                 <div v-for="field in data.values" :key="field.id">
-                  <p v-if="field.name === 'Floor Size'">{{ field.value }}M<sup>2</sup></p>
+                  <p v-if="field.name === 'Floor Size'">{{ field.value }}</p>
                 </div>
               </div>
             </div>
@@ -88,7 +88,7 @@
           <div v-if="property.displayData.length > 0">
             <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
               <div v-for="(field, j) in data.values" :key="j" class="col-md-6">
-                <div v-if="field.value.toUpperCase() != 'YES'">
+                <div v-if="field.value.toUpperCase() != 'TRUE'">
                   <i class="fa fa-check-circle"></i> {{ field.value }} {{ field.name }}
                 </div>
                 <div v-else><i class="fa fa-check-circle"></i> {{ field.name }}</div>
@@ -185,6 +185,15 @@ export default {
       index: null,
       date: new Date()
     };
+  },
+  computed: {
+    Images() {
+      const list = [];
+      for (let i = 0; i < this.propertyImages.length; i++) {
+        list.push(this.propertyImages[i].image);
+      }
+      return list;
+    }
   }
 };
 </script>

src/components/property/commercial/singleView/singleCommercialPage.vue

@@ -25,25 +25,29 @@ export default {
   components: {
     makeOffer,
     carouselSection,
-    contentSection
+    contentSection,
   },
   data() {
     return {
       index: null,
-      date: new Date()
+      date: new Date(),
     };
   },
   async mounted() {
     await this.getProperty(this.$route.params.id);
-    await this.getPropertyImages(this.$route.params.id);
-    this.mayEditProperty(this.$route.params.id);
+    // await this.getPropertyImages(this.$route.params.id);
+    // this.mayEditProperty(this.$route.params.id);
   },
   computed: {
     ...mapState("property", ["property", "propertyImages"]),
-    ...mapState("propertyEdit", ["mayEdit"])
+    ...mapState("propertyEdit", ["mayEdit"]),
   },
   methods: {
-    ...mapActions("property", ["getProperty", "getPropertyImages", "clearPropertyImages"]),
+    ...mapActions("property", [
+      "getProperty",
+      "getPropertyImages",
+      "clearPropertyImages",
+    ]),
     ...mapActions("propertyEdit", ["mayEditProperty"]),
     formatPrice(value) {
       const val = (value / 1).toFixed(2);
@@ -54,11 +58,11 @@ export default {
         return `${value}<br/>`;
       }
       return "";
-    }
+    },
   },
   beforeDestroy() {
     this.clearPropertyImages();
-  }
+  },
 };
 </script>
 

src/components/property/editProperty/editProperty.vue

@@ -66,11 +66,11 @@
                     :disabled="!canEdit"
                   >
                     <option value="0">Please select type *</option>
-                    <option
-                      v-for="item in propertyTypes"
-                      :value="item.id"
-                      :key="item.id"
-                    >{{ item.description }}</option>
+                    <option v-for="item in propertyTypes" :value="item.id" :key="item.id">
+                      {{
+                      item.description
+                      }}
+                    </option>
                   </select>
                 </div>
                 <div v-if="property.propertyUsageType === 'Commercial'" class="col-md-2">
@@ -268,16 +268,8 @@
               <div class="row">
                 <div class="col-md-12">
                   <label for="Property Description" style="font-family:'muli'">Description:</label>
-                  <vue-editor
-                    v-model="property.description"
-                    :editor-toolbar="customToolbar"
-                    :disabled="!canEdit"
-                  />
+                  <vue-editor v-model="property.description" :editor-toolbar="customToolbar" />
                   <br />
-                  <p>
-                    * A listing fee of R380 including VAT is payable to list your Property on the
-                    Uni-Vate website
-                  </p>
                 </div>
               </div>
               <div class="row">
@@ -295,8 +287,16 @@
                         :disabled="!canEdit"
                       />
                     </div>
-                    <div v-else class="display:none"></div>
-                    <div v-if="field.type === 'yesno'">
+                    <div v-else-if="field.type === 'text'">
+                      {{ field.name }}
+                      <input
+                        type="text"
+                        class="form-control uniInput"
+                        v-model="field.value"
+                        :disabled="!canEdit"
+                      />
+                    </div>
+                    <div v-else-if="field.type === 'yesno'">
                       {{ field.name }}
                       <input
                         type="checkbox"
@@ -304,6 +304,7 @@
                         :disabled="!canEdit"
                       />
                     </div>
+                    <div v-else class="display:none"></div>
                   </div>
                 </div>
               </div>
@@ -362,11 +363,6 @@
               />
               <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">Save</button>
               <button v-if="!wait" type="button" @click="Close()" class="btn-solid-blue">Close</button>
-              <div v-if="showPropertyTypeError">
-                <p
-                  class="alert myError"
-                >Missing fields. Please fill in all required fields. Marked with *</p>
-              </div>
               <div v-if="!addressSet">
                 <p class="alert myError">Please enter an address.</p>
               </div>
@@ -381,6 +377,7 @@
 
 <script>
 /* eslint-disable */
+import { VueEditor } from "vue2-editor";
 import { mapState, mapActions } from "vuex";
 import mapSection from "../mapSection";
 import ImageLoad from "../propertyImage";
@@ -391,6 +388,7 @@ export default {
   components: {
     mapSection,
     ImageLoad,
+    VueEditor,
   },
   data() {
     return {
@@ -399,6 +397,19 @@ export default {
       images: [],
       wait: false,
       canEdit: true,
+      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" }],
+      ],
     };
   },
   methods: {

src/components/property/residential/singleView/carouselSection.vue

@@ -16,7 +16,7 @@
           class="item"
           style="object-fit:cover"
           v-for="(image, i) in propertyImages"
-          :src="image"
+          :src="image.image"
           :key="i"
         />
       </carousel>

src/components/property/residential/singleView/contentSection.vue

@@ -15,19 +15,19 @@
             ></iframe>
             <div v-for="(image, i) in propertyImages" @click="index = i" :key="i">
               <div v-if="i < 3">
-                <img v-if="i === 0" style="width:100%" :src="image" />
+                <img v-if="i === 0" style="width:100%" :src="image.image" />
                 <div v-else-if="i !== 0">
                   <img
                     v-if="i % 2 === 0"
                     style="width:50%; height:140px; float:right;"
-                    :src="image"
+                    :src="image.image"
                   />
-                  <img v-else style="width:50%; height:140px; float:left" :src="image" />
+                  <img v-else style="width:50%; height:140px; float:left" :src="image.image" />
                 </div>
               </div>
             </div>
 
-            <gallery :images="propertyImages" :index="index" @close="index = null"></gallery>
+            <gallery :images="Images" :index="index" @close="index = null"></gallery>
           </div>
           <div class="panel-left p-5" style="margin-top:130px">
             <h2>Property Detial</h2>
@@ -39,7 +39,7 @@
             <p>{{ property.city }}, {{ property.suburb }}</p>
             <div v-for="(data, i) in property.displayData" :key="i">
               <div v-for="field in data.values" :key="field.id">
-                <p v-if="field.name === 'Floor Size'">{{ field.value }}M<sup>2</sup></p>
+                <p v-if="field.name === 'Floor Size'">{{ field.value }}</p>
                 <p v-if="field.name === 'Bedrooms'">Bedrooms {{ field.value }}</p>
                 <p v-if="field.name === 'Bathrooms'">Bathrooms {{ field.value }}</p>
               </div>
@@ -102,7 +102,7 @@
 
             <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
               <div v-for="(field, j) in data.values" :key="j" class="col-md-6">
-                <div v-if="field.value.toUpperCase() != 'YES'">
+                <div v-if="field.value.toUpperCase() != 'TRUE'">
                   <i class="fa fa-check-circle"></i> {{ field.value }} {{ field.name }}
                 </div>
                 <div v-else><i class="fa fa-check-circle"></i> {{ field.name }}</div>
@@ -185,6 +185,13 @@ export default {
         return url;
       }
       return "";
+    },
+    Images() {
+      const list = [];
+      for (let i = 0; i < this.propertyImages.length; i++) {
+        list.push(this.propertyImages[i].image);
+      }
+      return list;
     }
   }
 };

src/components/property/residential/singleView/singleResidentialPage.vue

@@ -24,34 +24,37 @@ export default {
   components: {
     makeOffer,
     carouselSection,
-    contentSection
+    contentSection,
   },
   data() {
     return {
       index: null,
       date: new Date(),
-      boolLoaded: false
+      boolLoaded: false,
     };
   },
   async mounted() {
-    console.log(this.$route.params.id);
-
     await this.getProperty(this.$route.params.id);
-    await this.getPropertyImages(this.$route.params.id);
-    setTimeout(() => {
-      if (this.propertyImages.length > 0) {
-        this.boolLoaded = true;
-      }
-    }, 100);
 
-    this.mayEditProperty(this.$route.params.id);
+    // await this.getPropertyImages(this.$route.params.id);
+    // setTimeout(() => {
+    //   if (this.propertyImages.length > 0) {
+    //     this.boolLoaded = true;
+    //   }
+    // }, 100);
+
+    //this.mayEditProperty(this.$route.params.id);
   },
   computed: {
     ...mapState("property", ["property", "propertyImages"]),
-    ...mapState("propertyEdit", ["mayEdit"])
+    ...mapState("propertyEdit", ["mayEdit"]),
   },
   methods: {
-    ...mapActions("property", ["getProperty", "getPropertyImages", "clearPropertyImages"]),
+    ...mapActions("property", [
+      "getProperty",
+      "getPropertyImages",
+      "clearPropertyImages",
+    ]),
     ...mapActions("propertyEdit", ["mayEditProperty"]),
 
     formatPrice(value) {
@@ -63,11 +66,11 @@ export default {
         return `${value}<br/>`;
       }
       return "";
-    }
+    },
   },
   beforeDestroy() {
     this.clearPropertyImages();
-  }
+  },
 };
 </script>
 

src/components/shared/listView.vue

@@ -4,8 +4,8 @@
     <div style="height:5px"></div>
     <div class="d-flex justify-content-between ">
       <div class="p-2" v-if="!hideSearch">
-        <float-label>
-          <input v-model="searchItem" class="form-control uniInput mt-3" placeholder="Search...." />
+        <float-label label="SEARCH">
+          <input v-model="searchItem" class="form-control uniInput mt-3" placeholder="Search..." />
         </float-label>
       </div>
       <div class="p-2" v-if="title">
@@ -168,6 +168,7 @@
 </template>
 
 <script>
+/* eslint-disable */
 import _ from "lodash";
 import ItemsPerPageList from "../../assets/staticData/itemsPerPage";
 import BasePagination from "./basePagination.vue";
@@ -467,6 +468,7 @@ export default {
       }
       return list.slice(startSlice, endSlice);
     },
+
     GetAllColumn() {}
   }
 };