Mynie's feedback fixes

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

@@ -1,12 +1,18 @@
 <template>
   <div>
-    <main id="main" style="margin-top:-20px">
+    <main id="main" style="margin-top: -20px">
       <div class="container pb-5">
         <div class="row">
           <div class="col">
-            <label v-if="!salesType" class="uniSelectLabel" for="saleType">Sale Type</label>
+            <label v-if="!salesType" class="uniSelectLabel" for="saleType"
+              >Sale Type</label
+            >
             <float-label label="Sale Type">
-              <select class="form-control uniSelect mb-3" name="saleType" v-model="salesType">
+              <select
+                class="form-control uniSelect mb-3"
+                name="saleType"
+                v-model="salesType"
+              >
                 <option value="Sale">To Sell</option>
                 <option value="Rental">To Rent</option>
               </select>
@@ -16,7 +22,9 @@
         <div class="row mt-2">
           <div class="col-md-6">
             <div v-if="!property.propertyName">
-              <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
+              <label for="propertyName" class="uniSelectLabel"
+                >PROPERTY NAME</label
+              >
             </div>
             <float-label label="PROPERTY NAME">
               <input
@@ -29,7 +37,9 @@
           </div>
           <div class="col-md-6">
             <div v-if="!property.propertyRef">
-              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
+              <label for="propertyName" class="uniSelectLabel"
+                >PROPERTY REFERENCE</label
+              >
             </div>
             <float-label label="PROPERTY REFERENCE">
               <input
@@ -51,7 +61,11 @@
               @change="PropertyTypeSelected"
             >
               <option value="0">Please select type *</option>
-              <option v-for="item in propertyTypes" :value="item.id" :key="item.id">
+              <option
+                v-for="item in propertyTypes"
+                :value="item.id"
+                :key="item.id"
+              >
                 {{ item.description }}
               </option>
             </select>
@@ -77,7 +91,7 @@
             <input
               type="checkbox"
               v-model="property.showAddress"
-              style="margin-right: 10px; margin-top: 10px;"
+              style="margin-right: 10px; margin-top: 10px"
             />
             <label>Show address on listing</label>
           </div>
@@ -88,7 +102,11 @@
                   <label
                     for="price"
                     class="uniSelectLabel"
-                    style="text-transform:uppercase; margin-left:17px; background-color:white"
+                    style="
+                      text-transform: uppercase;
+                      margin-left: 17px;
+                      background-color: white;
+                    "
                     >{{ salesType }} Price</label
                   >
                 </div>
@@ -114,6 +132,7 @@
                   <option value>Please select</option>
                   <option value="Month">Month</option>
                   <option value="Day">Day</option>
+                  <option value="m2">m2</option>
                 </select>
               </div>
             </div>
@@ -133,7 +152,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.streetNumber">
-                  <label for="streetNumber" class="uniSelectLabel">STREET NUMBER</label>
+                  <label for="streetNumber" class="uniSelectLabel"
+                    >STREET NUMBER</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -147,7 +168,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.streetName">
-                  <label for="streetName" class="uniSelectLabel">STREET NAME</label>
+                  <label for="streetName" class="uniSelectLabel"
+                    >STREET NAME</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -203,7 +226,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.postalCode">
-                  <label for="postalCode" class="uniSelectLabel">POSTAL CODE</label>
+                  <label for="postalCode" class="uniSelectLabel"
+                    >POSTAL CODE</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -230,7 +255,11 @@
             </div>
             <div class="row my-3">
               <div class="col-md-12">
-                <button type="button" @click="clearAddress()" class="btn-solid-blue">
+                <button
+                  type="button"
+                  @click="clearAddress()"
+                  class="btn-solid-blue"
+                >
                   Clear Address
                 </button>
               </div>
@@ -239,12 +268,17 @@
         </div>
         <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" />
+            <label for="Property Description" style="font-family: 'muli'"
+              >Description:</label
+            >
+            <vue-editor
+              v-model="property.description"
+              :editor-toolbar="customToolbar"
+            />
             <br />
             <p>
-              * A listing fee of R{{ getListingFee.amount }} including VAT is payable to list your
-              Property on the Uni-Vate website
+              * A listing fee of R{{ getListingFee.amount }} including VAT is
+              payable to list your Property on the Uni-Vate website
             </p>
           </div>
         </div>
@@ -256,7 +290,10 @@
             
           </div>
         </div> -->
-        <UserField :fields="propFields" @UpdateUserDefinedFields="UpdateUserDefinedFields" />
+        <UserField
+          :fields="propFields"
+          @UpdateUserDefinedFields="UpdateUserDefinedFields"
+        />
         <div class="row">
           <div class="col-sm-12">
             <div class="section-header">
@@ -266,9 +303,11 @@
         </div>
         <div class="form-group row">
           <div class="col-md-12">
-            <label v-if="!property.virtualTour" class="uniSelectLabel">Virtual Tour (URL)</label>
+            <label v-if="!property.virtualTour" class="uniSelectLabel"
+              >Virtual Tour (URL)</label
+            >
             <div class="input-group-prepend">
-              <float-label label="Virtual Tour (URL)" style="width:100%">
+              <float-label label="Virtual Tour (URL)" style="width: 100%">
                 <input
                   class="form-control uniInput"
                   type="link"
@@ -282,9 +321,11 @@
         </div>
         <div class="row">
           <div class="col-md-12 mt-2">
-            <label v-if="!property.video" class="uniSelectLabel">Video (URL)</label>
+            <label v-if="!property.video" class="uniSelectLabel"
+              >Video (URL)</label
+            >
             <div class="input-group-prepend">
-              <float-label label="video " style="width:100%">
+              <float-label label="video " style="width: 100%">
                 <input
                   class="form-control uniInput"
                   type="link"
@@ -310,7 +351,12 @@
           :savedImages="propertyImages"
           @DefaultImage="UpdateDefaultImage"
         />
-        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+        <button
+          v-if="!wait"
+          type="button"
+          @click="SubmitData()"
+          class="btn-solid-blue"
+        >
           Save
         </button>
         <div v-if="showPropertyTypeError">
@@ -341,10 +387,10 @@ export default {
     ImageLoad,
     VueEditor,
     carouselSection,
-    mapSection
+    mapSection,
   },
   props: {
-    propFields: {}
+    propFields: {},
   },
   data() {
     return {
@@ -357,17 +403,22 @@ export default {
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
-        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
+        [
+          { align: "" },
+          { align: "center" },
+          { align: "right" },
+          { align: "justify" },
+        ],
         [{ list: "ordered" }, { list: "bullet" }, { list: "check" }],
         [{ script: "sub" }, { script: "super" }],
-        [{ indent: "-1" }, { indent: "+1" }]
+        [{ indent: "-1" }, { indent: "+1" }],
       ],
       error: "",
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
       user: Log.getUser(),
-      mayEdit: Log.isLoggedIn()
+      mayEdit: Log.isLoggedIn(),
     };
   },
   methods: {
@@ -382,7 +433,7 @@ export default {
       "getPropertyEditDisplay",
       "getPropertySavedOverviewFields",
       "getPropertySavedFields",
-      "getSavedPropertyData"
+      "getSavedPropertyData",
     ]),
     updateLocation(place) {
       this.addressSet = true;
@@ -405,7 +456,10 @@ export default {
         this.showPropertyTypeError = true;
       }
 
-      if (this.salesType === "Rental" && this.property.dateAvailable === "undef") {
+      if (
+        this.salesType === "Rental" &&
+        this.property.dateAvailable === "undef"
+      ) {
         this.showDateError = true;
       }
 
@@ -429,7 +483,7 @@ export default {
         }
         this.property.propertyImages.push({
           image: this.images[i],
-          isDefault: setAsDefault
+          isDefault: setAsDefault,
         });
       }
       this.property.propertyUserFields = this.propertyFieldValues;
@@ -454,10 +508,12 @@ export default {
       console.log(this.property);
 
       this.saveProperty(this.property)
-        .then(fulfilled => {
-          this.$router.push(`/property/commercial/property/${fulfilled.data.id}`);
+        .then((fulfilled) => {
+          this.$router.push(
+            `/property/commercial/property/${fulfilled.data.id}`
+          );
         })
-        .catch(error => {
+        .catch((error) => {
           console.log(error.message);
         });
     },
@@ -479,7 +535,7 @@ export default {
     },
     UpdateUserDefinedFields(item) {
       let update = false;
-      this.propertyFieldValues.forEach(element => {
+      this.propertyFieldValues.forEach((element) => {
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
           element.value = item.value;
           update = true;
@@ -503,7 +559,7 @@ export default {
       this.property.postalCode = undefined;
       this.property.addressUrl = undefined;
       this.property.propertCoords = undefined;
-    }
+    },
   },
   mounted() {
     this.wait = false;
@@ -536,13 +592,15 @@ export default {
       "propertyOverviewFields",
       "propertyFields",
       "property",
-      "propertyImages"
+      "propertyImages",
     ]),
     ...mapState("authentication", ["user"]),
     ...mapGetters("fees", ["getListingFee"]),
     sortFields() {
       var display = [];
-      display = this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
+      display = this.propertyFields[0].fields.sort((a, b) =>
+        a.rank > b.rank ? 1 : -1
+      );
       return display;
     },
     SalesTypeChanged() {
@@ -562,13 +620,13 @@ export default {
       this.getPropertyTypes(this.propertyType);
 
       return this.propertyType;
-    }
+    },
   },
   watch: {
     SalesTypeChanged() {
       return null;
-    }
-  }
+    },
+  },
 };
 </script>
 

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

@@ -1,12 +1,18 @@
 <template>
   <div>
-    <main id="main" style="margin-top:-20px">
+    <main id="main" style="margin-top: -20px">
       <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="!salesType" 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="salesType"
+              >
                 <option value="Sale">To Sell</option>
                 <option value="Rental">To Rent</option>
               </select>
@@ -16,7 +22,9 @@
         <div class="row mt-2">
           <div class="col-md-6">
             <div v-if="!property.propertyName">
-              <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
+              <label for="propertyName" class="uniSelectLabel"
+                >PROPERTY NAME</label
+              >
             </div>
             <float-label label="PROPERTY NAME">
               <input
@@ -29,7 +37,9 @@
           </div>
           <div class="col-md-6">
             <div v-if="!property.propertyRef">
-              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
+              <label for="propertyName" class="uniSelectLabel"
+                >PROPERTY REFERENCE</label
+              >
             </div>
             <float-label label="PROPERTY REFERENCE">
               <input
@@ -51,9 +61,13 @@
               @change="PropertyTypeSelected"
             >
               <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 propertyTypesRes"
+                :value="item.id"
+                :key="item.id"
+              >
+                {{ item.description }}
+              </option>
             </select>
           </div>
         </div>
@@ -63,7 +77,7 @@
             <input
               type="checkbox"
               v-model="property.showAddress"
-              style="margin-right: 10px; margin-top: 10px;"
+              style="margin-right: 10px; margin-top: 10px"
             />
             <label>Show address on listing</label>
           </div>
@@ -74,13 +88,16 @@
                   <label
                     for="resPrice"
                     class="uniSelectLabel"
-                    style="text-transform:uppercase; margin-left:17px; background-color:white"
+                    style="
+                      text-transform: uppercase;
+                      margin-left: 17px;
+                      background-color: white;
+                    "
                     >{{ salesType }} Price</label
                   >
                 </div>
                 <float-label label="Price">
                   <currency-input
-                    onclick="this.setSelectionRange(0, this.value.length)"
                     name="resPrice"
                     :value="property.price"
                     @input="property.price = $event"
@@ -119,7 +136,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.streetNumber">
-                  <label for="resStreetNumber" class="uniSelectLabel">STREET NUMBER</label>
+                  <label for="resStreetNumber" class="uniSelectLabel"
+                    >STREET NUMBER</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -133,7 +152,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.streetName">
-                  <label for="resStreetName" class="uniSelectLabel">STREET NAME</label>
+                  <label for="resStreetName" class="uniSelectLabel"
+                    >STREET NAME</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -175,7 +196,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.province">
-                  <label for="resProvince" class="uniSelectLabel">PROVINCE</label>
+                  <label for="resProvince" class="uniSelectLabel"
+                    >PROVINCE</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -189,7 +212,9 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.postalCode">
-                  <label for="resPostalCode" class="uniSelectLabel">POSTAL CODE</label>
+                  <label for="resPostalCode" class="uniSelectLabel"
+                    >POSTAL CODE</label
+                  >
                 </div>
                 <input
                   class="form-control uniInput"
@@ -216,7 +241,11 @@
             </div>
             <div class="row my-3">
               <div class="col-md-12">
-                <button type="button" @click="clearAddress()" class="btn-solid-blue">
+                <button
+                  type="button"
+                  @click="clearAddress()"
+                  class="btn-solid-blue"
+                >
                   Clear Address
                 </button>
               </div>
@@ -225,12 +254,17 @@
         </div>
         <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" />
+            <label for="Property Description" style="font-family: 'muli'"
+              >Description:</label
+            >
+            <vue-editor
+              v-model="property.description"
+              :editor-toolbar="customToolbar"
+            />
             <br />
             <p>
-              * A listing fee of R{{ getListingFee.amount }} including VAT is payable to list your
-              Property on the Uni-Vate website
+              * A listing fee of R{{ getListingFee.amount }} including VAT is
+              payable to list your Property on the Uni-Vate website
             </p>
           </div>
         </div>
@@ -251,9 +285,11 @@
         </div>
         <div class="form-group row">
           <div class="col-md-12 mt-2">
-            <label v-if="!property.virtualTour" class="uniSelectLabel">Virtual Tour (URL)</label>
+            <label v-if="!property.virtualTour" class="uniSelectLabel"
+              >Virtual Tour (URL)</label
+            >
             <div class="input-group-prepend">
-              <float-label label="Virtual Tour (URL)" style="width:100%">
+              <float-label label="Virtual Tour (URL)" style="width: 100%">
                 <input
                   class="form-control uniInput"
                   type="link"
@@ -267,9 +303,11 @@
         </div>
         <div class="row">
           <div class="col-md-12 mt-2">
-            <label v-if="!property.video" class="uniSelectLabel">Video (URL)</label>
+            <label v-if="!property.video" class="uniSelectLabel"
+              >Video (URL)</label
+            >
             <div class="input-group-prepend">
-              <float-label label="Video (URL)" style="width:100%">
+              <float-label label="Video (URL)" style="width: 100%">
                 <input
                   class="form-control uniInput"
                   type="link"
@@ -295,7 +333,12 @@
           :savedImages="propertyImages"
           @DefaultImage="UpdateDefaultImage"
         />
-        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+        <button
+          v-if="!wait"
+          type="button"
+          @click="SubmitData()"
+          class="btn-solid-blue"
+        >
           Save
         </button>
         <div v-if="showPropertyTypeError">
@@ -326,10 +369,10 @@ export default {
     ImageLoad,
     VueEditor,
     carouselSection,
-    mapSection
+    mapSection,
   },
   props: {
-    propFields: {}
+    propFields: {},
   },
   data() {
     return {
@@ -342,22 +385,28 @@ export default {
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
-        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
+        [
+          { align: "" },
+          { align: "center" },
+          { align: "right" },
+          { align: "justify" },
+        ],
         [{ list: "ordered" }, { list: "bullet" }, { list: "check" }],
         [{ script: "sub" }, { script: "super" }],
-        [{ indent: "-1" }, { indent: "+1" }]
+        [{ indent: "-1" }, { indent: "+1" }],
       ],
       error: "",
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
       user: Log.getUser(),
-      mayEdit: Log.isLoggedIn()
+      mayEdit: Log.isLoggedIn(),
+      myprice: "0",
     };
   },
   methods: {
     ...mapActions("property", [
-      "getPropertyTypes",
+      "getPropertyTypesRes",
       "getPropertyOverviewFields",
       "getPropertyFields",
       "saveProperty",
@@ -367,7 +416,7 @@ export default {
       "getPropertyEditDisplay",
       "getPropertySavedOverviewFields",
       "getPropertySavedFields",
-      "getSavedPropertyData"
+      "getSavedPropertyData",
     ]),
     ...mapActions("register", ["getAgentById"]),
     updateLocation(place) {
@@ -390,7 +439,10 @@ export default {
         this.showPropertyTypeError = true;
       }
 
-      if (this.salesType === "Rental" && this.property.dateAvailable === "undef") {
+      if (
+        this.salesType === "Rental" &&
+        this.property.dateAvailable === "undef"
+      ) {
         this.showDateError = true;
       }
 
@@ -414,7 +466,7 @@ export default {
         }
         this.property.propertyImages.push({
           image: this.images[i],
-          isDefault: setAsDefault
+          isDefault: setAsDefault,
         });
       }
       this.property.propertyUserFields = this.propertyFieldValues;
@@ -437,10 +489,12 @@ export default {
       }
       //console.log(this.property);
       this.saveProperty(this.property)
-        .then(fulfilled => {
-          this.$router.push(`/property/residential/property/${fulfilled.data.id}`);
+        .then((fulfilled) => {
+          this.$router.push(
+            `/property/residential/property/${fulfilled.data.id}`
+          );
         })
-        .catch(error => {
+        .catch((error) => {
           console.log(error.message);
         });
     },
@@ -465,7 +519,7 @@ export default {
     },
     UpdateUserResidentialFields(item) {
       let update = false;
-      this.propertyFieldValues.forEach(element => {
+      this.propertyFieldValues.forEach((element) => {
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
           element.value = item.value;
           update = true;
@@ -499,7 +553,7 @@ export default {
         fields.push(arr.slice(i, (i += len)));
       }
       return fields;
-    }
+    },
   },
   mounted() {
     this.wait = false;
@@ -523,24 +577,26 @@ export default {
     }
     this.salesType = this.$route.params.saleType;
 
-    this.getPropertyTypes(this.propertyType);
+    this.getPropertyTypesRes();
 
     this.getPropertyOverviewFields();
     //this.getPropertyFields(this.propertyType);
   },
   computed: {
     ...mapState("property", [
-      "propertyTypes",
+      "propertyTypesRes",
       "propertyOverviewFields",
       "propertyFields",
       "property",
-      "propertyImages"
+      "propertyImages",
     ]),
     ...mapState("authentication", ["user"]),
     ...mapGetters("fees", ["getListingFee"]),
     ...mapState("register", ["agent"]),
     sortFields() {
-      return this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
+      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
@@ -560,13 +616,13 @@ export default {
     },
     userFieldsArr() {
       return this.userFieldsArrFunc(this.propertyFields, 4);
-    }
+    },
   },
   watch: {
     SalesTypeChanged() {
       return null;
-    }
-  }
+    },
+  },
 };
 </script>