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

merge with crm

Browse Source
This commit is contained in:
Yan
2017-06-26 14:23:56 +06:30
parent 00c19fdd67 12483aba97
commit e1c981e8c2
9 changed files with 78 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,8 +129,10 @@
</div>
<div class="card-title row customer_detail hide">
<div class="col-lg-6 col-md-6 col-sm-6">
<%if @customer %>
<p class="hidden customer-id"><%= @customer.customer_id %></p>
<p>Customer : <%= @customer.name %></p>
<p>Customer : <%= @customer.name %></p>
<%end%>
</div>
</div>
@@ -250,7 +252,7 @@
<button type="button" id="discount" class="btn btn-primary btn-block">Discount</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
<button type="button" id="pay" class="btn btn-primary btn-block">Pay</button>
<button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button>
<!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
</div>
</div>
<script>