git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-12-08 16:31:39 +06:30
parent dd5936b991 2415adff98
commit e04ef1e223
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dining_facility.rb
View File

@@ -85,7 +85,7 @@ class DiningFacility < ApplicationRecord
checkout_at = booking.checkout_at.utc
checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int
checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int
# checkout_at_min -= min
checkout_at_min -= min
if (checkout_at_hr <= hr) && (checkout_at_min <= 15)
return booking
else

12
app/views/settings/processing_items/_form.html.erb
View File

@@ -51,14 +51,14 @@
</div>
<% end %>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 align-center">
<%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect', :style => "width: 150px" %>
</div>
</div>
</div>
</div>
<div class="form-actions">
<%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
<br>
<% end %>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">