Timeshare sell & Property Listing fix

src/components/admin/status/editTimeShareAdminPage.vue

@@ -648,7 +648,22 @@ export default {
     this.selectedResort = this.weekParam.resort.resortCode;
     this.selectedBedrooms = this.weekParam.bedrooms;
     this.selectedMaxSleep = this.weekParam.maxSleep;
-    this.selectedWeekType = this.weekParam.weekType;
+    var weekTypeEnum = "";
+    switch (this.weekParam.weekType.toUpperCase()) {
+      case "FLEXI":
+        weekTypeEnum = "0";
+        break;
+      case "FIXED":
+        weekTypeEnum = "1";
+        break;
+      case "MODULE":
+        weekTypeEnum = "2";
+        break;
+      case "SYNDICATE":
+        weekTypeEnum = "3";
+        break;
+    }
+    this.selectedWeekType = weekTypeEnum;
     this.selectedStatus = this.weekParam.status;
     this.selectedPublish = this.weekParam.publish;
     this.fixDates();
@@ -848,13 +863,14 @@ export default {
       this.weekParam.module = this.week.module;
       parseFloat(this.weekParam.sellPrice);
       parseFloat(this.weekParam.levyAmount);
-      this.weekParam.weekType = this.selectedWeekType;
+      this.weekParam.weekType = parseInt(this.selectedWeekType);
       delete this.weekParam.Owner;
       delete this.weekParam.agency;
       delete this.weekParam.agent;
       //delete this.status;
       delete this.weekParam.owner.howMarried;
       delete this.weekParam.cellNumber;
+      console.log(this.weekParam);
       console.log(this.week.owner);
       this.week.owner.name =
         this.week.owner.name.charAt(0).toUpperCase() + this.week.owner.name.slice(1);

src/components/property/commercial/createProperty/commercialCreateNew.vue

@@ -371,7 +371,7 @@ export default {
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
-      user: Log.getUser(),
+      comUser: Log.getUser(),
       mayEdit: Log.isLoggedIn()
     };
   },
@@ -438,18 +438,17 @@ export default {
         });
       }
       this.property.propertyUserFields = this.propertyFieldValues;
-
-      if (this.user) {
-        this.property.userId = this.user.id;
+      this.property.propertyUserFields.forEach(field => {
+        if (field.type === "yesno") {
+          if (field.value) {
+            field.value = "true";
+          }
+        }
+      });
+      if (this.comUser) {
+        this.property.userId = this.comUser.id;
       }
 
-      // this.property.propertyUserFields.forEach(item => {
-      //   if (item.value === true) {
-      //     item.value = "yes";
-      //   } else if (item.value === false) {
-      //     item.value = "no";
-      //   }
-      // });
       if (Log.getUser().role === "Agency" || Log.getUser().role === "Agent") {
         this.retrieveAgency().then(() => {
           this.property.agentId = this.agent[0].id;
@@ -550,21 +549,14 @@ export default {
       return display;
     },
     SalesTypeChanged() {
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      // this.propertyType = this.$route.params.propType;
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
       this.salesType = this.$route.params.saleType;
       if (this.property && this.property.propertyUsageType) {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
         this.propertyType = this.property.propertyUsageType;
       }
-
       if (!this.$route.query.id) {
         this.getPropertyFields(this.propertyType);
       }
-
       this.getPropertyTypes(this.propertyType);
-
       return this.propertyType;
     }
   },

src/components/property/propertyUserField.vue

@@ -4,7 +4,11 @@
       <div v-if="!setFields[i] && currentField.type !== 'yesno'">
         <label class="uniSelectLabel" style="margin-top:10px;">{{ currentField.name }}</label>
       </div>
-      <float-label :label="currentField.name" style="width:100%;top:-1em !important;">
+      <float-label
+        v-if="currentField.type === 'number'"
+        :label="currentField.name"
+        style="width:100%;top:-1em !important;"
+      >
         <input
           v-if="currentField.type === 'number'"
           class="form-control uniInput"
@@ -15,7 +19,12 @@
           v-model="setFields[i]"
           @change="UpdateSetFields(currentField, i)"
         />
-
+      </float-label>
+      <float-label
+        v-if="currentField.type === 'text'"
+        :label="currentField.name"
+        style="width:100%;top:-1em !important;"
+      >
         <input
           v-if="currentField.type === 'text'"
           class="form-control uniInput"
@@ -57,7 +66,8 @@ export default {
     UpdateSetFields(field, index) {
       const item = {
         userDefinedFieldId: field.id,
-        value: this.setFields[index]
+        value: this.setFields[index],
+        type: field.type
       };
       if (item) {
         this.$emit("UpdateUserDefinedFields", item);

src/components/property/residential/createProperty/residentialCreate.vue

@@ -440,16 +440,14 @@ export default {
         this.property.userId = this.user.id;
       }
       console.log(this.propertyFieldValues);
-
-      // this.saveProperty(this.property)
-      //   .then((fulfilled) => {
-      //     this.$router.push(
-      //       `/property/residential/property/${fulfilled.data.id}`
-      //     );
-      //   })
-      //   .catch((error) => {
-      //     console.log(error.message);
-      //   });
+      console.log("It was here");
+      this.saveProperty(this.property)
+        .then(fulfilled => {
+          this.$router.push(`/property/residential/property/${fulfilled.data.id}`);
+        })
+        .catch(error => {
+          console.log(error.message);
+        });
     },
     Close() {
       this.$router.push("/property/admin/list/my");

src/components/property/residential/createProperty/residentialCreateNew.vue

@@ -4,9 +4,9 @@
       <div class="container pb-5">
         <div class="row">
           <div class="col">
-            <label v-if="!salesType" class="uniSelectLabel" for="resSaleType">Sale Type</label>
+            <label v-if="!resSalesType" class="uniSelectLabel" for="resSaleType">Sale Type</label>
             <float-label label="Sale Type">
-              <select class="form-control uniSelect mb-3" name="resSaleType" v-model="salesType">
+              <select class="form-control uniSelect mb-3" name="resSaleType" v-model="resSalesType">
                 <option value="Sale">To Sell</option>
                 <option value="Rental">To Rent</option>
               </select>
@@ -79,7 +79,7 @@
                       margin-left: 17px;
                       background-color: white;
                     "
-                    >{{ salesType }} Price</label
+                    >{{ resSalesType }} Price</label
                   >
                 </div>
                 <float-label label="Price">
@@ -93,7 +93,7 @@
                   />
                 </float-label>
               </div>
-              <div v-if="salesType === 'Rental'" class="col-md-6">
+              <div v-if="resSalesType === 'Rental'" class="col-md-6">
                 <select
                   class="form-control uniSelect"
                   name="resPropertyType"
@@ -229,7 +229,7 @@
         <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" />
+            <vue-editor v-model="property.description" :editor-toolbar="resCustomToolbar" />
             <br />
             <p>
               * A listing fee of R{{ getListingFee.amount }} including VAT is payable to list your
@@ -298,15 +298,15 @@
           :savedImages="propertyImages"
           @DefaultImage="UpdateDefaultImage"
         />
-        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+        <button v-if="!resWait" type="button" @click="SubmitData()" class="btn-solid-blue">
           Save
         </button>
-        <div v-if="showPropertyTypeError">
+        <div v-if="resShowPropertyTypeError">
           <p class="alert myError">
             Missing fields. Please fill in all required fields. Marked with *
           </p>
         </div>
-        <div v-if="wait" id="preloader"></div>
+        <div v-if="resWait" id="preloader"></div>
       </div>
     </main>
   </div>
@@ -336,13 +336,13 @@ export default {
   },
   data() {
     return {
-      propertyType: "Residential",
-      salesType: "Rental",
-      images: [],
-      propertyFieldValues: [],
-      defaultImage: 0,
-      wait: false,
-      customToolbar: [
+      resPropertyType: "Residential",
+      resSalesType: "Rental",
+      resImages: [],
+      resPropertyFieldValues: [],
+      resDefaultImage: 0,
+      resWait: false,
+      resCustomToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
         [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
@@ -350,13 +350,10 @@ export default {
         [{ script: "sub" }, { script: "super" }],
         [{ indent: "-1" }, { indent: "+1" }]
       ],
-      error: "",
-      addressSet: false,
-      showPropertyTypeError: false,
-      showDateError: false,
-      user: Log.getUser(),
-      mayEdit: Log.isLoggedIn(),
-      myprice: "0"
+      resAddressSet: false,
+      resShowPropertyTypeError: false,
+      resShowDateError: false,
+      resUser: Log.getUser()
     };
   },
   methods: {
@@ -375,7 +372,7 @@ export default {
     ]),
     ...mapActions("register", ["getAgentById"]),
     updateLocation(place) {
-      this.addressSet = true;
+      this.resAddressSet = true;
       this.property.streetNumber = place.streetNumber;
       this.property.streetName = place.streetName;
       this.property.suburb = place.suburb;
@@ -387,52 +384,52 @@ export default {
       this.property.propertCoords = place.coords;
     },
     TypeChanged() {
-      this.property.propertyUsageType = this.propertyType;
+      this.property.propertyUsageType = this.resPropertyType;
     },
     SubmitData() {
       if (this.property.propertyTypeId === 0) {
-        this.showPropertyTypeError = true;
+        this.resShowPropertyTypeError = true;
       }
 
-      if (this.salesType === "Rental" && this.property.dateAvailable === "undef") {
-        this.showDateError = true;
+      if (this.resSalesType === "Rental" && this.property.dateAvailable === "undef") {
+        this.resShowDateError = true;
       }
 
-      if (this.showPropertyTypeError || this.showDateError) {
+      if (this.resShowPropertyTypeError || this.resShowDateError) {
         return;
       }
 
-      this.wait = true;
-      if (this.salesType === "Sale") {
+      this.resWait = true;
+      if (this.resSalesType === "Sale") {
         this.property.isSale = true;
         this.property.dateAvailable = new Date();
       }
-      if (this.images.length > 0) {
+      if (this.resImages.length > 0) {
         this.property.propertyImages = [];
       }
       // eslint-disable-next-line no-plusplus
-      for (let i = 0; i < this.images.length; i++) {
+      for (let i = 0; i < this.resImages.length; i++) {
         let setAsDefault = false;
-        if (i === this.defaultImage) {
+        if (i === this.resDefaultImage) {
           setAsDefault = true;
         }
         this.property.propertyImages.push({
-          image: this.images[i],
+          image: this.resImages[i],
           isDefault: setAsDefault
         });
       }
-      this.property.propertyUserFields = this.propertyFieldValues;
-
-      if (this.user) {
-        this.property.userId = this.user.id;
+      this.property.propertyUserFields = this.resPropertyFieldValues;
+      this.property.propertyUserFields.forEach(field => {
+        if (field.type === "yesno") {
+          if (field.value) {
+            field.value = "true";
+          }
+        }
+      });
+      if (this.resUser) {
+        this.property.userId = this.resUser.id;
       }
-      // this.property.propertyUserFields.forEach(item => {
-      //   if (item.value === true) {
-      //     item.value = "yes";
-      //   } else if (item.value === false) {
-      //     item.value = "no";
-      //   }
-      // });
+
       if (Log.getUser().role === "Agency" || Log.getUser().role === "Agent") {
         this.retrieveAgency().then(() => {
           this.property.agentId = this.agent[0].id;
@@ -440,6 +437,7 @@ export default {
         });
       }
       //console.log(this.property);
+      //console.log(JSON.stringify(this.property));
       this.saveProperty(this.property)
         .then(fulfilled => {
           this.$router.push(`/property/residential/property/${fulfilled.data.id}`);
@@ -459,31 +457,40 @@ export default {
     },
     PropertyTypeSelected(item) {
       if (item.target.options.selectedIndex > 0) {
-        this.showPropertyTypeError = false;
+        this.resShowPropertyTypeError = false;
       } else {
-        this.showPropertyTypeError = true;
+        this.resShowPropertyTypeError = true;
       }
     },
     loadedImages(values) {
-      this.images = values;
+      this.resImages = values;
     },
     UpdateUserResidentialFields(item) {
       let update = false;
-      this.propertyFieldValues.forEach(element => {
+
+      this.resPropertyFieldValues.forEach(element => {
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
-          element.value = item.value;
-          update = true;
+          if (item.type !== "yesno") {
+            element.value = item.value;
+            update = true;
+          } else {
+            if (item.value) {
+              element.value = "true";
+            } else {
+              element.value = "false";
+            }
+          }
         }
       });
       if (!update) {
-        this.propertyFieldValues.push(item);
+        this.resPropertyFieldValues.push(item);
       }
     },
     UpdateDefaultImage(item) {
-      this.defaultImage = item;
+      this.resDefaultImage = item;
     },
     clearAddress() {
-      this.addressSet = false;
+      this.resAddressSet = false;
       this.property.streetNumber = undefined;
       this.property.streetName = undefined;
       this.property.suburb = undefined;
@@ -506,11 +513,11 @@ export default {
     }
   },
   mounted() {
-    this.wait = false;
+    this.resWait = false;
     this.getProperty(0);
     this.clearPropertyImages();
-    this.images = [];
-    this.defaultImage = 0;
+    this.resImages = [];
+    this.resDefaultImage = 0;
 
     if (this.propertyOverviewFields.length > 0) {
       this.propertyOverviewFields = [];
@@ -523,9 +530,9 @@ export default {
     }
 
     if (this.$route.params.propertyUsageType) {
-      this.propertyType = this.$route.params.propertyUsageType;
+      this.resPropertyType = this.$route.params.propertyUsageType;
     }
-    this.salesType = this.$route.params.saleType;
+    this.resSalesType = this.$route.params.saleType;
 
     this.getPropertyTypesRes();
 
@@ -543,27 +550,15 @@ export default {
     ...mapState("authentication", ["user"]),
     ...mapGetters("fees", ["getListingFee"]),
     ...mapState("register", ["agent"]),
-    sortFields() {
-      return this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
-    },
     SalesTypeChanged() {
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      // this.propertyType = this.$route.params.propType;
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      this.salesType = this.$route.params.saleType;
+      this.resSalesType = this.$route.params.saleType;
       if (this.property && this.property.propertyUsageType) {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.propertyType = this.property.propertyUsageType;
+        this.resPropertyType = this.property.propertyUsageType;
       }
-
       if (!this.$route.query.id) {
-        this.getPropertyFields(this.propertyType);
+        this.getPropertyFields(this.resPropertyType);
       }
-
-      return this.propertyType;
-    },
-    userFieldsArr() {
-      return this.userFieldsArrFunc(this.propertyFields, 4);
+      return this.resPropertyType;
     }
   },
   watch: {

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

@@ -122,8 +122,8 @@
               <div class="col-md-4">
                 <button
                   style="float:right; white-space: nowrap;"
-                  :class="checkStatus() ? 'btn-disabled mt-3' : 'btn-solid-blue mt-3'"
-                  :disabled="checkStatus()"
+                  :class="status ? 'btn-disabled mt-3' : 'btn-solid-blue mt-3'"
+                  :disabled="status"
                   @click="goToSingle()"
                 >
                   ENQUIRE NOW
@@ -188,7 +188,8 @@ export default {
   },
   props: {
     property: {},
-    propertyImages: {}
+    propertyImages: {},
+    status: {}
   },
   async mounted() {
     await this.checkForVideos;
@@ -203,7 +204,7 @@ export default {
   },
   methods: {
     //...mapActions("searchTab", ["getListsForPropertyEdit"])
-    ...mapActions("status", ["getSingleStatus"]),
+
     checkForVideos() {
       if (this.property.video === "") {
         this.property.video = null;
@@ -214,23 +215,10 @@ export default {
     },
     goToSingle() {
       this.$router.push({ name: "EnquireNow", params: { id: this.$route.params.id } });
-    },
-    checkStatus() {
-      this.getSingleStatus(this.property.statusId);
-      if (
-        this.singleStatus.code === "CIP" ||
-        this.singleStatus.code === "S" ||
-        this.singleStatus.code === "P"
-      ) {
-        return true;
-      } else {
-        return false;
-      }
     }
   },
   computed: {
     //...mapState("searchTab", ["provinces", "cities", "suburbs"]),
-    ...mapState("status", ["singleStatus"]),
     propertyMap() {
       if (this.property.propertCoords) {
         var lat = this.property.propertCoords.split(",")[0];
@@ -246,11 +234,6 @@ export default {
       }
       return "";
     },
-    propertyFeatures() {
-      this.property.displayData.forEach(data => {
-        console.log(data);
-      });
-    },
     Images() {
       const list = [];
       for (let i = 0; i < this.propertyImages.length; i++) {

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

@@ -1,14 +1,9 @@
 <template>
   <div>
-    <!-- <carouselSection :propertyImages="propertyImages" @Loaded="CarouselDone" /> -->
     <main id="main" style="margin-top: 20px">
-      <contentSection
-        :property="property"
-        :propertyImages="propertyImages"
-        @Loaded="ContentDone"
-      />
+      <contentSection :property="property" :propertyImages="propertyImages" :status="checkStatus" />
     </main>
-    <div v-if="Wait" id="preloader"></div>
+    <div v-if="wait" id="preloader"></div>
   </div>
 </template>
 
@@ -24,36 +19,39 @@ export default {
   name: "property",
   components: {
     makeOffer,
-    contentSection,
+    contentSection
   },
   data() {
     return {
       index: null,
       date: new Date(),
       boolLoaded: false,
-      wait: false,
-      contentloaded: false,
+      wait: true
     };
   },
   mounted() {
     this.clearPropertyImages();
-    this.getDisplayProperty(this.$route.params.id).then((data) => {
+    this.getDisplayProperty(this.$route.params.id).then(data => {
       this.wait = false;
     });
   },
   computed: {
     ...mapState("property", ["property", "propertyImages"]),
-    Wait() {
-      if (this.wait && !this.contentloaded) {
+    checkStatus() {
+      if (
+        this.property.statusCode === "CIP" ||
+        this.property.statusCode === "S" ||
+        this.property.statusCode === "P"
+      ) {
         return true;
+      } else {
+        return false;
       }
-      return false;
-    },
+    }
   },
   methods: {
     ...mapActions("property", ["getDisplayProperty", "clearPropertyImages"]),
     ...mapActions("propertyEdit", ["mayEditProperty"]),
-
     formatPrice(value) {
       const val = (value / 1).toFixed(2);
       return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ");
@@ -63,17 +61,11 @@ export default {
         return `${value}<br/>`;
       }
       return "";
-    },
-    CarouselDone() {
-      this.carouselLoaded = true;
-    },
-    ContentDone() {
-      this.contentloaded = true;
-    },
+    }
   },
   beforeDestroy() {
     this.clearPropertyImages();
-  },
+  }
 };
 </script>
 

src/components/timeshare/sell/contentSectionNew.vue

@@ -332,6 +332,7 @@
                     type="text"
                     name="name"
                     class="form-control"
+                    :disabled="ChangeCustomUser"
                     id="name"
                     placeholder="Name"
                     data-rule="minlen:4"
@@ -347,6 +348,7 @@
                   <input
                     type="text"
                     class="form-control"
+                    :disabled="ChangeCustomUser"
                     name="surname"
                     id="surname"
                     placeholder="Surname"
@@ -365,6 +367,7 @@
                     type="text"
                     name="idnum"
                     class="form-control"
+                    :disabled="ChangeCustomUser"
                     id="idnum"
                     placeholder="ID Number"
                     data-rule="minlen:4"
@@ -380,6 +383,7 @@
                   <input
                     type="text"
                     class="form-control"
+                    :disabled="ChangeCustomUser"
                     name="company"
                     id="company"
                     placeholder="Company Reg Number"
@@ -405,6 +409,7 @@
                     <select
                       class="form-control uniSelect"
                       id="howMarried"
+                      :disabled="ChangeCustomUser"
                       v-model="indiv.howMarried"
                     >
                       <option v-bind:value="0">N/A</option>
@@ -428,6 +433,7 @@
                     type="text"
                     class="form-control"
                     name="email"
+                    :disabled="ChangeCustomUser"
                     id="email"
                     placeholder="Email Address"
                     data-msg="Please enter your email address"
@@ -445,6 +451,7 @@
                     type="text"
                     name="cell"
                     class="form-control"
+                    :disabled="ChangeCustomUser"
                     id="cell"
                     placeholder="Cell Number"
                     data-rule="minlen:4"
@@ -460,6 +467,7 @@
                   <input
                     type="text"
                     class="form-control"
+                    :disabled="ChangeCustomUser"
                     name="landline"
                     id="landline"
                     placeholder="Landline Number"
@@ -972,6 +980,13 @@ export default {
       });
       return notDeletedArr;
     },
+    ChangeCustomUser() {
+      if (this.selectedUserType === "myself") {
+        return true;
+      } else {
+        return false;
+      }
+    },
     CanSave() {
       if (this.indiv.howMarried === "In Community Of Property") {
         if (this.indiv.spouseName || this.indiv.spouseSurname || this.spouseEmail) {

src/router/index.js

@@ -23,8 +23,8 @@ import PropertyPage from "../components/property/propertyPage.vue";
 import PropertyEdit from "../components/property/editProperty/editProperty.vue";
 
 import PropertyCreate from "../components/property/propertyCreate.vue";
-import CommercialCreate from "../components/property/commercial/createProperty/commercialCreate.vue";
-import ResidentialCreate from "../components/property/residential/createProperty/residentialCreate.vue";
+import CommercialCreate from "../components/property/commercial/createProperty/commercialCreateNew.vue";
+import ResidentialCreate from "../components/property/residential/createProperty/residentialCreateNew.vue";
 import ListProperty from "../components/property/ListProperty/listPropertyPage.vue";
 
 import PropertyAdminList from "../components/admin/property/propertyAdmin.vue";

src/store/modules/property/property.js

@@ -97,6 +97,7 @@ export default {
         .catch(ex => console.log(ex.response));
     },
     getSavedPropertyImages({ commit }, id) {
+      console.log(id);
       axios
         .get(`/api/PropertyImage/GetProperySavedImages/${id}`)
         .then(result => commit("setPropertyImages", result.data))