app/controllers/property_hires_controller.rb

@@ -275,14 +275,14 @@ class PropertyHiresController < ApplicationController
       phire_id = booking_p[:id]
     end
     data = check_for_availability(start_time,end_time,booking_p[:property_id], booking_p[:recurring_interval], booking_p[:recurring_end_date], time_setting_id)
-    if data["success"] == true || is_admin_page
+    if data["success"] == true
       error_messages = property.check_require_fields(booking_p)
       if error_messages.present?
         data["msg"] = error_messages
         data["success"] = false
       end
     end
-    if data["success"] == true || is_admin_page
+    if data["success"] == true
       hire = nil
       if phire_id
         hire = PHire.find(phire_id) rescue nil

app/helpers/admin/property_hires_helper.rb

@@ -110,7 +110,7 @@ module Admin::PropertyHiresHelper
         when "datetime"
           print_format = print_format.gsub("{#{field_name}}", phire.send(field_name).strftime("%Y/%m/%d %H:%M")) rescue print_format.gsub("{#{field_name}}", "")
         else
-          print_format = print_format.gsub("{#{field_name}}", phire.send(field_name).to_s).gsub(/\r\n|\r|\n/, "<br />") rescue print_format.gsub("{#{field_name}}", "")
+          print_format = print_format.gsub("{#{field_name}}", phire.send(field_name).to_s) rescue print_format.gsub("{#{field_name}}", "")
         end
       else
         field = PHireField.where(:key => field_name, :property_id => phire.property_id).first

app/views/admin/property_hires/_attribute_field.html.erb

@@ -4,7 +4,7 @@
 %>
   <div class="attributes-header clearfix">
     <div class="toggle-control" style="float: right;">
-      <div class="togglebox <%= attribute_field.disabled ?  'disable' : ''%>">
+      <div class="togglebox <%= attribute_field.disabled ?  'disabled' : ''%>">
       <%= hidden_field "#{@field_name}[p_hire_fields][#{@af_counter}]","disabled",:value=>attribute_field.disabled,:class=>"toggle-check", :data=>{:deploy=>"right"} %>
       <label><b></b></label>
       </div>

app/views/admin/property_hires/_form.html.erb

@@ -690,7 +690,6 @@
             <a id="add_note_select_field" class="btn btn-primary"><%=t(:add)%></a>
           </div>
       </div>
-      </div>
     </div>
     <!-- print settings  -->
     <div class="tab-pane fade" id="printsettings">
@@ -707,6 +706,7 @@
         </tbody>
       </table>
     </div>
+  </div>
     <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">

app/views/admin/property_hires/custom_fields.erb

@@ -23,7 +23,7 @@
   <fieldset>
 
     <div id="attributes-area" class="input-area">
-      <%= render partial: "attribute_field",collection: @attribute.p_hire_fields.asc(:_id)%>
+      <%= render partial: "attribute_field",collection: @attribute.p_hire_fields_enabled.asc(:_id)%>
     </div>
 
     <div class="form-actions">