Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<%= f.input :charge_type, :collection => [:hr, :day] %>
|
||||
<%= f.input :minimum_free_time %>
|
||||
<%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>
|
||||
<%= f.input :time_rounding %>
|
||||
<%= f.input :time_rounding, :collection => [:down, :up] %>
|
||||
<%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %>
|
||||
<%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user