harrybomrah
/
property_hire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for reserve button for admin and reserve button logic

This commit is contained in:
rulingcom 2025-10-22 22:13:06 +08:00
parent 105e4969d0
commit cd7da404bc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/property_hires_controller.rb
View File

@ -430,7 +430,7 @@ class PropertyHiresController < ApplicationController
end end
end end
if check === true if check === true
@user_total_hired_hours = @property.get_user_total_user_hired_hours(OrbitHelper.current_user.id.to_s, sd, ed) @user_total_hired_hours = @property.get_user_total_user_hired_hours(sd, ed)
end end
if @user_total_hired_hours >= @property.hours_restriction if @user_total_hired_hours >= @property.hours_restriction
available = false available = false
@ -440,7 +440,11 @@ class PropertyHiresController < ApplicationController
if available if available
if DateTime.now >= (@property.start_date || DateTime.now - 1.day) && DateTime.now <= (@property.end_date || DateTime.now + 1.month) if DateTime.now >= (@property.start_date || DateTime.now - 1.day) && DateTime.now <= (@property.end_date || DateTime.now + 1.month)
available = date > (DateTime.now + (@property.need_hire_before).send(@property.need_hire_before_unit)) if @is_user_manager === false
available = date > (DateTime.now + (@property.need_hire_before).send(@property.need_hire_before_unit))
else
available = true
end
end end
end end
@ -481,7 +485,7 @@ class PropertyHiresController < ApplicationController
end_date = endt.to_date end_date = endt.to_date
@end_date = end_date @end_date = end_date
@first_check_time = startt.strftime("%H:%M") @first_check_time = startt.strftime("%H:%M")
@all_day_settings = all_day_settings @all_day_settings = all_day_settings.sort_by { |k, _| k.to_i }.to_h
@startt = startt @startt = startt
@endt = endt @endt = endt
@weeknumber = 0 @weeknumber = 0
@ -559,6 +563,7 @@ class PropertyHiresController < ApplicationController
check_events = @need_check_events[0..i] check_events = @need_check_events[0..i]
end end
@need_check_events = @need_check_events[(i+1)..-1] @need_check_events = @need_check_events[(i+1)..-1]
if check_events.count != 0 if check_events.count != 0
settings = settings.select do |s| settings = settings.select do |s|
if s[4] == 0 #reservation_limit == 0 => no limit if s[4] == 0 #reservation_limit == 0 => no limit