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

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

Browse Source
This commit is contained in:
Nweni
2017-06-12 20:15:35 +06:30
parent a8a8c2b984 8fc4fa5cf1
commit dfd7eec2e9
7 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/_header.html.erb
View File

@@ -27,8 +27,8 @@
<li class="navbar-nav mr-auto dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Transactions</a>
<ul class="dropdown-menu">
<li><%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %></li>
<li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
<li><%= link_to "Orders ", settings_orders_path, :tabindex =>"-1" %></li>
<li><%= link_to "Sales ", settings_sales_path, :tabindex =>"-1" %></li>
</ul>
</li>
<li class="navbar-nav mr-auto dropdown">

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

@@ -87,6 +87,11 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@booking_orders.each do |bko|
# No Show completed
if bko.sale_status == 'completed'
next
end
# Assigned Id for new Order? Sale?
unique_id=""
customer_id=""
@@ -145,6 +150,11 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@booking_rooms.each do |rmo|
# No Show completed
if rmo.sale_status == 'completed'
next
end
# Assigned Id for new Order? Sale?
unique_id=""
customer_id=""
@@ -204,6 +214,10 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@orders.each do |odr|
# No Show completed
if odr.sale_status == 'completed'
next
end
# Assigned Id for new Order? Sale?
unique_id=""
customer_id=""
@@ -319,7 +333,7 @@
sub_total = 0
if @selected_item_type == "Order"
@selected_item.order_items.each do |order_item|
sub_total += order_item.qty*order_item.unit_price
sub_total += (order_item.qty*order_item.unit_price)
%>
<tr>
<td class='item-name'><%= order_item.item_name %></td>