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

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-12-13 10:12:45 +06:30
parent f45849de49 afe3c995ae
commit 949835ffdc
18 changed files with 1037 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/origami/addorders/detail.html.erb
View File

@@ -122,20 +122,20 @@
<% else %>
<% if @table.get_current_checkout_booking.nil? %>
<% if !menu.code.include? "SPL" %>
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
<div class='card-block custom-card-block'>
<p><%=menu.name%> <p>
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
<div class='card-block custom-card-block'>
<p><%=menu.name%> <p>
<p><%=menu.code%> <p>
</div>
</div>
<% end%>
<% else %>
</div>
<% end%>
<% else %>
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
<div class='card-block custom-card-block'>
<p><%=menu.name%> <p>
<p><%=menu.code%> <p>
</div>
</div>
<p><%=menu.code%> <p>
</div>
</div>
<% end%>
<!-- end quick_service or cashier for table -->
<% end %>

1
app/views/origami/dashboard/_menu.json.jbuilder
View File

@@ -95,6 +95,7 @@ if (menu.menu_categories)
json.is_default is.is_default
json.is_on_promotion is.is_on_promotion
json.promotion_price is.promotion_price
json.out_of_stock is.is_out_of_stock
json.values instance_attr
end
end