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-12 10:25:07 +06:30
parent 121fb92b9b d65882ac5b
commit c5e9d7afd5
10 changed files with 170 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/views/origami/home/index.html.erb
View File

@@ -51,7 +51,12 @@
<div class="card orders <%= sale_status %>">
<div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p>
<<<<<<< HEAD
<h4 class="card-title orders-table"><%= cpo.table_name %></h4>
=======
<p class="hidden customer-id"><%= bko.customer_id %></p>
<h4 class="card-title orders-table"><%= bko.table_name %></h4>
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
<p class="card-text">
Receipt No :
<span class="orders-receipt-no">
@@ -157,8 +162,14 @@
%>
<div class="card orders <%= sale_status %>">
<div class="card-block">
<<<<<<< HEAD
<p class="hidden orders-id"><%= unique_id %></p>
<h4 class="card-title orders-table"><%= rmo.room_name %></h4>
=======
<p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= rmo.customer_id %></p>
<h4 class="card-title orders-table"><%= rmo.room_name %></h4>
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
<p class="card-text">
Receipt No :
<span class="orders-receipt-no">
@@ -211,8 +222,14 @@
%>
<div class="card orders <%= sale_status %>">
<div class="card-block">
<<<<<<< HEAD
<p class="hidden orders-id"><%= unique_id %></p>
<h4 class="card-title orders-table"><%= odr.table_name %></h4>
=======
<p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= odr.customer_id %></p>
<h4 class="card-title orders-table"><%= odr.table_name %></h4>
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
<p class="card-text">
Receipt No :
<span class="orders-receipt-no">
@@ -255,6 +272,15 @@
<p>Date: <span id="receipt_date"><%=@selected_item.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
</div>
</div>
<div class="card-title row customer_detail hide">
<div class="col-lg-6 col-md-6 col-sm-6">
<p>Customer : <span id="customer_name"></span></p>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Amount : <span id="customer_amount"></span></p>
</div>
</div>
<div class="card-text">
<table class="table table-striped" id="order-items-table">
<thead>
@@ -339,13 +365,11 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Add Order</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled id="customer" disabled>Customer</button>
<button type="button" class="btn btn-primary btn-lg btn-block" id="customer" disabled>Customer</button>
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button>
<!-- Cashier Buttons -->
<button type="button" id="discount" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
<button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>