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

check status

Browse Source
This commit is contained in:
phyusin
2018-09-25 11:10:08 +06:30
parent 00016097d8
commit 3d44c570b2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/origami/reservation/index.html.erb
View File

@@ -1,5 +1,9 @@
<%= stylesheet_link_tag 'reservation', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %>
<div class="container-fluid"> <div class="container-fluid">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
</div> </div>
</div>
</div>

2
app/views/transactions/sales/show.html.erb
View File

@@ -47,7 +47,7 @@
<button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button> <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
</th> </th>
<% end %> <% end %>
<% else %> <% elsif @sale.sale_status == "new" %>
<% if current_login_employee.role == "administrator" %> <% if current_login_employee.role == "administrator" %>
<%if @membership.discount && @sale.customer.membership_id %> <%if @membership.discount && @sale.customer.membership_id %>
<th> <th>