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

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

Browse Source
This commit is contained in:
phyusin
2017-12-22 09:27:05 +06:30
parent bc3beea75b a10a41f3ed
commit 9094d46209
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/origami/rooms/show.html.erb
View File

@@ -186,7 +186,7 @@
<div class="card-title row customer_detail p-l-5 p-r-5" > <div class="card-title row customer_detail p-l-5 p-r-5" >
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p> <p class="hidden customer-id"><%= @obj_sale.customer_id rescue '' %></p>
&nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %> &nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %>
<%else%> <%else%>
<p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p> <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
@@ -361,7 +361,8 @@
<!-- <button type="button" id="first_bill" class="btn bg-blue btn-block" disabled>First Bill</button> --> <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block" disabled>First Bill</button> -->
<!-- <button type="button" id="pay" class="btn bg-blue btn-block" disabled>Pay</button> --> <!-- <button type="button" id="pay" class="btn bg-blue btn-block" disabled>Pay</button> -->
<!-- <button type="button" class="btn bg-blue btn-block" disabled=""> Void </button> --> <!-- <button type="button" class="btn bg-blue btn-block" disabled=""> Void </button> -->
<% else %> <% end %>
<% if @status_sale == 'sale' %>
<!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> --> <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
<button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button> <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
<button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button> <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>