Fix to Merge

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

               @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 propertyTypes"
+                :value="item.id"
+                :key="item.id"
+              >{{ item.description }}</option>
             </select>
           </div>
         </div>
                     for="price"
                     class="uniSelectLabel"
                     style="text-transform:uppercase; margin-left:17px; background-color:white"
-                    >{{ salesType }} Price</label
-                  >
+                  >{{ salesType }} Price</label>
                 </div>
                 <float-label label="Price">
-                  <currency-input <<<<<<< HEAD ======= onclick="this.setSelectionRange(0,
-                  this.value.length)" >>>>>>> 6bbfd86e089da859d019dcbda5cc0fe053af8db2 name="price"
-                  :value="property.price" @input="property.price = $event" v-model="property.price"
-                  id="price" class="form-control uniInput" />
+                  <currency-input
+                    onclick="this.setSelectionRange(0, this.value.length)"
+                    name="price"
+                    :value="property.price"
+                    @input="property.price = $event"
+                    v-model="property.price"
+                    id="price"
+                    class="form-control uniInput"
+                  />
                 </float-label>
               </div>
               <div v-if="salesType === 'Rental'" class="col-md-6">
             </div>
             <div class="row my-3">
               <div class="col-md-12">
-                <button type="button" @click="clearAddress()" class="btn-solid-blue">
-                  Clear Address
-                </button>
+                <button type="button" @click="clearAddress()" class="btn-solid-blue">Clear Address</button>
               </div>
             </div>
           </div>
           :fields="propertyOverviewFields[0].fields"
           @UpdateUserDefinedFields="UpdateUserDefinedFields"
           :id="1"
-        ></UserField> -->
+        ></UserField>-->
         <!-- <div class="row">
           <div class="col-md-12">
             <div v-for="item in propertyFields" :key="item.id">
           :savedImages="propertyImages"
           @DefaultImage="UpdateDefaultImage"
         />
-        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
-          Save
-        </button>
+        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">Save</button>
         <div v-if="showPropertyTypeError">
-          <p class="alert myError">
-            Missing fields. Please fill in all required fields. Marked with *
-          </p>
+          <p class="alert myError">Missing fields. Please fill in all required fields. Marked with *</p>
         </div>
         <div v-if="wait" id="preloader"></div>
       </div>
     ImageLoad,
     VueEditor,
     carouselSection,
-    mapSection
+    mapSection,
   },
   data() {
     return {
       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: {
       "getPropertyEditDisplay",
       "getPropertySavedOverviewFields",
       "getPropertySavedFields",
-      "getSavedPropertyData"
+      "getSavedPropertyData",
     ]),
     updateLocation(place) {
       this.addressSet = true;
         this.showPropertyTypeError = true;
       }
 
-      if (this.salesType === "Rental" && this.property.dateAvailable === "undef") {
+      if (
+        this.salesType === "Rental" &&
+        this.property.dateAvailable === "undef"
+      ) {
         this.showDateError = true;
       }
 
         }
         this.property.propertyImages.push({
           image: this.images[i],
-          isDefault: setAsDefault
+          isDefault: setAsDefault,
         });
       }
       this.property.propertyUserFields = this.propertyFieldValues;
       if (this.user) {
         this.property.userId = this.user.id;
       }
-      this.property.propertyUserFields.forEach(item => {
+      this.property.propertyUserFields.forEach((item) => {
         if (item.value === true) {
           item.value = "yes";
         } else if (item.value === false) {
       });
 
       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);
         });
     },
     },
     UpdateUserDefinedFields(item) {
       let update = false;
-      this.propertyFieldValues.forEach(element => {
+      this.propertyFieldValues.forEach((element) => {
         console.log(element);
 
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
         fields.push(arr.slice(i, (i += len)));
       }
       return fields;
-    }
+    },
   },
   mounted() {
     console.log(this.propertyFields);
       "propertyOverviewFields",
       "propertyFields",
       "property",
-      "propertyImages"
+      "propertyImages",
     ]),
     ...mapState("authentication", ["user"]),
     ...mapGetters("fees", ["getListingFee"]),
     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
     },
     userFieldsArr() {
       return this.userFieldsArrFunc(this.propertyFields, 4);
-    }
+    },
   },
   watch: {
     SalesTypeChanged() {
       return null;
-    }
-  }
+    },
+  },
 };
 </script>
 

src/components/timeshare/sell/contentSection.vue

   name: "TimeshareToSell",
   props: {
     weekId: {
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
       wait: false,
-      userLoggedIn: Log.isLoggedIn()
+      userLoggedIn: Log.isLoggedIn(),
     };
   },
   components: {
     addressAutoComplete,
-    Alert
+    Alert,
   },
   mounted() {
     if (this.sellItem.id) {
       "sellItem",
       "agencies",
       "agents",
-      "getTemplate"
+      "getTemplate",
     ]),
     ...mapState("individual", ["indiv"]),
     ...mapState("authentication", ["isLoggedIn"]),
     ...mapGetters({
       user: "authentication/getUser",
-      person: "authentication/getPerson"
+      person: "authentication/getPerson",
     }),
     ...mapState("bank", ["banks"]),
     refAgent() {
         this.sellItem.region.regionCode
       ) {
         const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.sellItem.region.regionCode
+          (region) =>
+            region.region.regionCode === this.sellItem.region.regionCode
         );
         if (item) {
           list = item.children;
       } else {
         list = this.resorts;
       }
-      return _.sortBy(list, x => x.resortName);
+      return _.sortBy(list, (x) => x.resortName);
     },
     isLoggedIn() {
       return this.user && this.person;
     },
     displayNotDeletedAgents() {
       var notDeletedArr = [];
-      this.agents.forEach(agent => {
+      this.agents.forEach((agent) => {
         if (!agent.isDeleted) {
           if (agent.agencyId === this.sellItem.agencyId) {
             notDeletedArr.push(agent);
         return false;
       }
       return true;
-    }
+    },
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
       "initTimeshare",
       "onResortChange",
       "saveWeek",
-      "getBlankWeek"
+      "getBlankWeek",
     ]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
       if (this.userLoggedIn) {
         this.sellItem.ownerObject = this.indiv;
         this.sellItem.status = undefined;
-        console.log(this.sellItem);
-        //   this.saveWeek(this.sellItem).then(fulfilled => {
-        //     this.paygateRedirect();
-        //   });
+        this.saveWeek(this.sellItem).then((fulfilled) => {
+          this.paygateRedirect();
+        });
       }
     },
     paygateRedirect() {
         creatydById: Log.getUser().id, //Log.getUser().id,
         amount: amount,
         paymentStatus: "",
-        paymentToken: ""
+        paymentToken: "",
       };
 
-      this.addPayment(paymentObj).then(res => {
+      this.addPayment(paymentObj).then((res) => {
         this.$router.push({
           name: "PaymentGateway",
           params: {
             paymentReqId: res.PAY_REQUEST_ID,
-            checksum: res.CHECKSUM
-          }
+            checksum: res.CHECKSUM,
+          },
         });
       });
     },
     resortChange() {
       this.onResortChange({
         resortName: this.sellItem.resort.resortName,
-        resortCode: this.sellItem.resort.resortCode
+        resortCode: this.sellItem.resort.resortCode,
       });
 
       if (this.sellItem && this.sellItem.resort === "Other") {
       } else {
         this.sellItem.mandateDate = undefined;
       }
-    }
-  }
+    },
+  },
 };
 </script>