app/controllers/admin/property_hires_controller.rb

@@ -1,38 +1,20 @@
 class Admin::PropertyHiresController < OrbitAdminController
   include Admin::PropertyHiresHelper
-
   def index
-    if PropertyHireSortOrder.count == 0
-      PropertyHireSortOrder.create('sort_order' => false)
-    end
-
-    if !(params['order_asc'].nil?)
-      if params['order_asc'] == 'true'
-        PropertyHireSortOrder.first.update_attributes('sort_order' => true)
-      elsif params['order_asc'] == 'false'
-        PropertyHireSortOrder.first.update_attributes('sort_order' => false)
-      end
-      
-      sort_direction = PropertyHireSortOrder.first['sort_order'] ? 1 : -1
-      Property.recalc_sort_number(sort_direction)
-    end
-
-    @choose = PropertyHireSortOrder.first['sort_order']
     @tags = @module_app.tags
     @categories = @module_app.categories.enabled
     @filter_fields = filter_fields(@categories, @tags)
     @table_fields = ["property_hire.title", :category, "property_hire.location", "property_hire.available_for_hire"]
 
-    @properties = Property.order_by(tmp_sort_number: :asc)
+    @properties = Property.order_by(order_position: :asc)
                           .with_categories(filters("category"))
                           .with_tags(filters("tag"))
-    @properties = search_data(@properties, [:title]).page(params[:page]).per(10)
 
+    @properties = search_data(@properties,[:title]).page(params[:page]).per(10)
     if request.xhr?
       render :partial => "index"
     end
   end
-
   def fields_display_order
     uid = params[:id].split("-").last
     @property = Property.find_by(:uid=>uid)

app/controllers/property_hires_controller.rb

@@ -2,7 +2,7 @@ class PropertyHiresController < ApplicationController
   include Admin::PropertyHiresHelper
   FrontendMethods = ["hire", "view_calendar", "hire_success"]
   def index
-    properties = Property.can_display.filter_by_categories.order_by(tmp_sort_number: :asc)
+    properties = Property.can_display.filter_by_categories.order_by(order_position: :asc)
     url = "/#{I18n.locale}#{OrbitHelper.page.get_url}"
     data = index_data(properties, url)
     filterprops = data.dup
@@ -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
@@ -364,26 +364,10 @@ class PropertyHiresController < ApplicationController
   end
 
   def check_availability
-    property = Property.find(params[:property_id])
-  
-    if !check_if_user_is_manager?
-      # 1. 取得預約日期並歸零時間 (設為該日 00:00:00)
-      book_date = Time.zone.parse(params[:stime]).beginning_of_day
-    
-    # 2. 取得「今天」的凌晨 00:00:00，再加 7 天
-    # 這樣判定會變成：只要是 7 天後的「那一天」就准許
-      limit_day = Time.zone.now.beginning_of_day + property.need_hire_before.send(property.need_hire_before_unit)
-    
-      if book_date < limit_day
-        msg = "預約失敗：此項目最快僅能預約 #{limit_day.strftime('%Y-%m-%d')} 之後的時段。"
-        render json: { success: false, msg: msg }
-        return
-    end
+    time_setting_id = params[:time_setting_id]
+    data = check_for_availability params[:stime], params[:etime], params[:property_id], params[:interval], params[:recurring_end_date], time_setting_id
+    render :json => data.to_json
   end
-  time_setting_id = params[:time_setting_id]
-  data = check_for_availability params[:stime], params[:etime], params[:property_id], params[:interval], params[:recurring_end_date], time_setting_id
-  render :json => data.to_json
-end
 
 
 
@@ -498,11 +482,7 @@ end
     start_wday = startt.wday
     start_date = startt.to_date
     @start_date = start_date
-    if endt > endt.beginning_of_day
-      end_date = endt.to_date + 1.day
-    else
-      end_date = endt.to_date
-    end
+    end_date = endt.to_date
     @end_date = end_date
     @first_check_time = startt.strftime("%H:%M")
     @all_day_settings = all_day_settings.sort_by { |k, _| k.to_i }.to_h
@@ -533,7 +513,7 @@ end
             if i != -1
               check_events = @need_check_events[0..i]
             end
-            #@need_check_events = @need_check_events[(i+1)..-1]
+            @need_check_events = @need_check_events[(i+1)..-1]
             settings = @all_day_settings[wday_str]
 
             if check_events.count != 0
@@ -600,7 +580,7 @@ end
         @start_date += 7.day
       end
     end
-    all_days = (end_date-start_date).to_i  
+    all_days = (end_date-start_date).to_i
     end_wday = 6
     end_date_wday = end_date.wday
     only_first_week = false

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/models/property.rb

@@ -895,42 +895,4 @@ class Property
     end
     emails.select{|email| email.present?}
   end
-    def self.check_sort_number
-    ph_sort_order = PropertyHireSortOrder.first
-    if ph_sort_order && ph_sort_order.need_update_sort
-      self.recalc_sort_number(ph_sort_order.sort_order)
-    end
-  end
-
-  def self.recalc_sort_number(sort_order=nil)
-    if sort_order.nil?
-      sort_order = (PropertyHireSortOrder.first['sort_order'] rescue false) ? 1 : -1
-    end
-    sorted_hires = self.all.to_a.sort_by{|k| [
-      (k["is_top"] ? 0 : 1), 
-      (k["order_position"].nil? ? Float::INFINITY : sort_order * k["order_position"].to_i),
-      -k["created_at"].to_i
-    ]}
-
-    sorted_hires.each_with_index do |a, i|
-      a.instance_variable_set(:@skip_callback, true)
-      self.where(:id => a.id).update_all(:tmp_sort_number => i)
-    end
-
-    min_pos, max_pos = (sorted_hires.count != 0) ? (sorted_hires.map{|a| a.order_position.to_i}.minmax) : [0, 0]
-    PropertyHireSortOrder.update_all(
-      :min_sort_number => min_pos, 
-      :max_sort_number => max_pos, 
-      :need_update_sort => false
-    )
-
-    self.create_indexes
-    return max_pos
-  end
-  after_create :trigger_recalc
-
-  def trigger_recalc
-    order_status = PropertyHireSortOrder.first.try(:sort_order)
-    self.class.recalc_sort_number(order_status ? 1 : -1)
-  end
 end

app/models/property_hire_sort_order.rb

@@ -1,53 +0,0 @@
-class PropertyHireSortOrder
-  include Mongoid::Document
-  field :sort_order, :type => Boolean   
-  field :need_update_sort, :type => Boolean, :default => true
-  field :min_sort_number, :type => Integer, :default => 0
-  field :max_sort_number, :type => Integer, :default => 0
-
-  after_initialize do |record|
-    if(!record.new_record? && record.sort_order.nil?)
-      record.sort_order = true
-      record.save
-    elsif(!record.new_record?)
-      @module_app = ModuleApp.where(:key=>'property_hire').first
-      if !@module_app.nil?
-        @asc = @module_app.asc rescue nil
-        if !@asc.nil?
-          record.sort_order = @asc
-          record.save
-        end
-      end
-    end
-  end
-
-  after_save do |record|
-    unless record.instance_variable_get(:@skip_callback)
-      if record.sort_order_changed?
-        @module_app = ModuleApp.where(:key=>'property_hire').first
-        if !@module_app.nil?
-          @sort_order = record.sort_order rescue nil
-          if !@sort_order.nil? 
-            if !@module_app.attributes[:asc].nil?
-              @module_app.asc = @sort_order
-              @module_app.save
-            end
-          end
-        end
-        record.instance_variable_set(:@skip_callback, true)
-        record.update(:need_update_sort=>true)
-        if record.need_update_sort
-          Thread.new do
-            sort_order = record.sort_order ? 1 : -1
-            PHire.recalc_sort_number(sort_order)
-            record.instance_variable_set(:@skip_callback, false)
-          end
-        end
-      end
-    end
-  end
-
-  def get_default_order
-    self.sort_order ? self.min_sort_number : self.max_sort_number
-  end
-end

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/_sort_order_choose.html.erb

@@ -1,18 +0,0 @@
-<script>
-function change_order(){
-    var value = $("form[name='order_form']").find("input[type='checkbox']")[0].checked
-    $("input[name='order_asc']").val(String(value))
-    document.order_form.submit()
-}
-</script>
-<form method="get" action='?' name='order_form'>
-<input type='hidden' name='order_asc' value=''>
-<nobr>
-<%= t('archive.choose_order')+':' %>
-<% if @choose %>
-<input type="checkbox" onchange='change_order()' checked><span><%= t('archive.yes') %></span>
-<% else %>
-<input type="checkbox" onchange='change_order()'><span><%= t('archive.no') %></span>
-<% end %>
-</nobr>
-</form>

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">

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

@@ -1,5 +1,4 @@
 <%=  render_filter @filter_fields, "index_table" %>
-<%= render 'sort_order_choose' %>
 <span id="index_table">
   <%= render 'index'%>
 </span>