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

src/components/property/commercial/createProperty/commercialCreateNew.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 v-if="propertyType === 'Commercial'" class="col-md-2">
                 </div>
                 <float-label label="price">
                   <currency-input
-                    onClick="this.setSelectionRange(0, this.value.length)"
+                    onclick="this.setSelectionRange(0, this.value.length)"
                     name="price"
                     :value="property.price"
                     @input="property.price = $event"
                   name="streetNumber"
                   id="streetNumber"
                   v-model="property.streetNumber"
-                  disabled
                 />
               </div>
             </div>
                   name="streetName"
                   id="streetName"
                   v-model="property.streetName"
-                  disabled
                 />
               </div>
             </div>
                   name="suburb"
                   id="suburb"
                   v-model="property.suburb"
-                  disabled
                 />
               </div>
             </div>
                   name="city"
                   id="city"
                   v-model="property.city"
-                  disabled
                 />
               </div>
             </div>
                   name="province"
                   id="province"
                   v-model="property.province"
-                  disabled
                 />
               </div>
             </div>
                   name="postalCode"
                   id="postalCode"
                   v-model="property.postalCode"
-                  disabled
                 />
               </div>
             </div>
                   name="country"
                   id="country"
                   v-model="property.country"
-                  disabled
                 />
               </div>
             </div>
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
-      userParam: Log.getUser(),
+      user: Log.getUser(),
       mayEdit: Log.isLoggedIn()
     };
   },

src/components/property/editProperty/editProperty.vue

                         name="streetNumber"
                         id="unit"
                         v-model="property.streetNumber"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>
                         name="streetName"
                         id="unit"
                         v-model="property.streetName"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>
                         name="suburb"
                         id="unit"
                         v-model="property.suburb"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>
                         name="city"
                         id="unit"
                         v-model="property.city"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>
                         name="province"
                         id="unit"
                         v-model="property.province"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>
                         name="postalCode"
                         id="unit"
                         v-model="property.postalCode"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>
                         name="country"
                         id="unit"
                         v-model="property.country"
-                        disabled
+                        :disabled="!canEdit"
                       />
                     </div>
                   </div>

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>
                   >
                 </div>
                 <float-label label="Price">
-                  <currency-input
-                    name="price"
-                    :value="property.price"
-                    @input="property.price = $event"
-                    v-model="property.price"
-                    id="price"
-                    class="form-control uniInput"
-                  />
+                  <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" />
                 </float-label>
               </div>
               <div v-if="salesType === 'Rental'" class="col-md-6">
                   name="streetNumber"
                   id="streetNumber"
                   v-model="property.streetNumber"
-                  disabled
                 />
               </div>
             </div>
                   name="streetName"
                   id="streetName"
                   v-model="property.streetName"
-                  disabled
                 />
               </div>
             </div>
                   name="suburb"
                   id="suburb"
                   v-model="property.suburb"
-                  disabled
                 />
               </div>
             </div>
                   name="city"
                   id="city"
                   v-model="property.city"
-                  disabled
                 />
               </div>
             </div>
                   name="province"
                   id="province"
                   v-model="property.province"
-                  disabled
                 />
               </div>
             </div>
                   name="postalCode"
                   id="postalCode"
                   v-model="property.postalCode"
-                  disabled
                 />
               </div>
             </div>
                   name="country"
                   id="country"
                   v-model="property.country"
-                  disabled
                 />
               </div>
             </div>
               />
             </div>
           </div>
-        </div> -->
+        </div>-->
         <div class="row">
           <div class="col-sm-12">
             <div class="section-header">
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
-      userParam: Log.getUser(),
+      user: Log.getUser(),
       mayEdit: Log.isLoggedIn()
     };
   },