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

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-06-12 17:32:38 +06:30
parent d1ae734f50 e6647dd494
commit ddf85905ef
9 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,13 @@
# Assigned Id for new Order? Sale?
unique_id = ""
customer_id = ""
# For CSS- Class for Order? Sale?
sale_status=""
if cpo.order_status == 'new'
unique_id=cpo.booking_id
customer_id=cpo.order_customer_id
# check selected item and assign
if @selected_item != nil
if cpo.order_id == @selected_item.order_id
@@ -41,6 +44,7 @@
end
else
unique_id=cpo.sale_id
customer_id=cpo.sale_customer_id
sale_status="paid"
# check selected item and assign
if @selected_item != nil
@@ -52,9 +56,11 @@
%>
<div class="card orders <%= sale_status %>">
<div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= customer_id %></p>
<h4 class="card-title orders-table"><%= cpo.table_name %></h4>
<p class="hidden order-cid"><%= cpo.order_id %></p>
<h4 class="card-title orders-table"><%= cpo.table_name %></h4>
<p class="card-text">
Receipt No :
<span class="orders-receipt-no">