diff --git a/app/controllers/admin/property_hires_controller.rb b/app/controllers/admin/property_hires_controller.rb index 7128d29..b3cd106 100644 --- a/app/controllers/admin/property_hires_controller.rb +++ b/app/controllers/admin/property_hires_controller.rb @@ -176,6 +176,10 @@ class Admin::PropertyHiresController < OrbitAdminController end end + def print_setting + @property = Property.where(:uid => params[:id].split("-").last).first rescue nil + end + def delete_booking_details booking = PHire.find(params[:id]) property = booking.property diff --git a/app/models/p_hire.rb b/app/models/p_hire.rb index 4d0c5f2..3dce9d4 100644 --- a/app/models/p_hire.rb +++ b/app/models/p_hire.rb @@ -27,6 +27,7 @@ class PHire field :mobile_phone_of_contact_person field :contact_person_Email field :contact_person_department + field :recommendation belongs_to :property has_many :p_hire_field_values, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :p_hire_field_values, allow_destroy: true diff --git a/app/models/property.rb b/app/models/property.rb index 8e0fec4..8aacd78 100644 --- a/app/models/property.rb +++ b/app/models/property.rb @@ -35,6 +35,7 @@ class Property field :p_display_end_time, type: DateTime field :recurring_enable, type: Boolean, :default => false field :property_color, :default => "#000000" + field :print_format mount_uploader :image, ImageUploader diff --git a/app/views/admin/property_hires/_admin_hire.html.erb b/app/views/admin/property_hires/_admin_hire.html.erb index 011ed1d..96726ce 100644 --- a/app/views/admin/property_hires/_admin_hire.html.erb +++ b/app/views/admin/property_hires/_admin_hire.html.erb @@ -816,6 +816,12 @@ ul.list-unstyled li { <% end %> +
+ <%= f.label :recommendation, t("property_hire.recommendation"), :class => "col-sm-#{label_col} control-label" %> +
+ <%= f.text_area :recommendation %> +
+
<% if f.object.id.present? %> diff --git a/app/views/admin/property_hires/_form.html.erb b/app/views/admin/property_hires/_form.html.erb index bff2863..24abc62 100644 --- a/app/views/admin/property_hires/_form.html.erb +++ b/app/views/admin/property_hires/_form.html.erb @@ -100,6 +100,7 @@
  • <%= t('property_hire.available_time')%>
  • <%= t('property_hire.auto_send_email_set') %>
  • <%= t('property_hire.reservation_fields') %>
    • +
  • <%= t('property_hire.print_settings') %>
    • @@ -136,16 +137,6 @@ <%= f.text_field :other_location %>
    - <% -=begin%> -
    - <%= f.label :property_number, t("property_hire.property_number"), :class => "control-label muted" %> -
    - <%= f.text_field :property_number %> -
    -
    -<% -=end%>
    <%= f.label :p_display_start_time, t("property_hire.p_display_start_time"), :class => "control-label muted" %>
    @@ -193,16 +184,6 @@
    - <% -=begin%> -
    - <%= f.label :purchase_date, t("property_hire.purchase_date"), :class => "control-label muted" %> -
    - <%= f.datetime_picker :purchase_date, :no_label => true, :new_record => @property.new_record?, :picker_type => "date", :format => "yyyy/MM/dd" %> -
    -
    -<% -=end%>
    <%= f.label :owners, t("property_hire.owners"), :class => "control-label muted" %>
    @@ -233,16 +214,6 @@ <%= f.text_field :owner_phone %>
    - <% -=begin%> -
    - <%= f.label :price, t("property_hire.price"), :class => "control-label muted" %> -
    - <%= f.text_field :price %> -
    -
    -<% -=end%>
    @@ -597,66 +568,66 @@
    +
    <% fields_name = f.object.class::FIELDSNAME %>
    - - - - - - - - - - - - <% fields_name.each do |field_name| %> - - - - - - - - - - <% end %> - -
    <%= t('property_hire.field_name') %><%= t('property_hire.name') %><%= t('property_hire.placeholder') %><%= t('property_hire.disable') %><%= t('property_hire.required') %><%= t('property_hire.for_label') %><%= t('property_hire.for_display') %>
    - <%= t("property_hire.#{field_name}") %> - - <%= render_custom_text_field(f,field_name,"name") %> - - <%= render_custom_text_field(f,field_name,"placeholder") %> - - - <%= check_box_tag("#{f.object_name}[#{field_name}][enable]", "0" , (f.object.send(field_name)["enable"] == "0" rescue false)) %> - - - <%= check_box_tag("#{f.object_name}[#{field_name}][required]", "true" , (f.object.send(field_name)["required"] == "true" rescue false), class: "for_required") %> - <% for_label = f.object.send(field_name)["required"] == "true" ? true : false %> - - <%= f.radio_button :calendar_label_field_name, field_name, {:class => "for_label_selection #{(for_label == true ? '' : 'hide')}" } %> - - - <%= check_box_tag("#{f.object_name}[#{field_name}][for_display]", "true" , (f.object.send(field_name)["for_display"] == "true" rescue false), class: "for_display") %> - <% for_label = f.object.send(field_name)["for_display"] == "true" ? true : false %> -
    + + + + + + + + + + + + <% fields_name.each do |field_name| %> + + + + + + + + + + <% end %> + +
    <%= t('property_hire.field_name') %><%= t('property_hire.name') %><%= t('property_hire.placeholder') %><%= t('property_hire.disable') %><%= t('property_hire.required') %><%= t('property_hire.for_label') %><%= t('property_hire.for_display') %>
    + <%= t("property_hire.#{field_name}") %> + + <%= render_custom_text_field(f,field_name,"name") %> + + <%= render_custom_text_field(f,field_name,"placeholder") %> + + + <%= check_box_tag("#{f.object_name}[#{field_name}][enable]", "0" , (f.object.send(field_name)["enable"] == "0" rescue false)) %> + + + <%= check_box_tag("#{f.object_name}[#{field_name}][required]", "true" , (f.object.send(field_name)["required"] == "true" rescue false), class: "for_required") %> + <% for_label = f.object.send(field_name)["required"] == "true" ? true : false %> + + <%= f.radio_button :calendar_label_field_name, field_name, {:class => "for_label_selection #{(for_label == true ? '' : 'hide')}" } %> + + + <%= check_box_tag("#{f.object_name}[#{field_name}][for_display]", "true" , (f.object.send(field_name)["for_display"] == "true" rescue false), class: "for_display") %> + <% for_label = f.object.send(field_name)["for_display"] == "true" ? true : false %> +
    - <% field_name = "enable_notes_selector" %> - -
    - -
    -
    -
    + <% field_name = "enable_notes_selector" %> + +
    + +
    +
    <% field_name = "notes_selector" %>
    @@ -718,8 +689,23 @@
    <%=t(:add)%>
    +
    +
    + +
    + + + + + + + +
    + <%= label_tag t('property_hire.print_format') %> + + <%= f.text_area :print_format,class: 'ckeditor' %> +
    -
    <%= t(:language) %>
    @@ -762,17 +748,17 @@ <% end %> - -
    - <% referer = request.referer rescue nil %> - <% referer = get_referer_url if referer.blank? || request.host != URI.parse(URI.encode(referer)).host %> - - <% unless @property.new_record? %> - <%= hidden_field_tag("property[id]", @property.id) %> - <% end %> - <%= f.submit t('submit'), class: 'btn btn-primary' %> - <%= link_to t('cancel'), referer, :class=>"btn" %> -
    + +
    + <% referer = request.referer rescue nil %> + <% referer = get_referer_url if referer.blank? || request.host != URI.parse(URI.encode(referer)).host %> + + <% unless @property.new_record? %> + <%= hidden_field_tag("property[id]", @property.id) %> + <% end %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), referer, :class=>"btn" %> +