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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-04-02 14:36:14 +06:30
parent d29b7a9d49 3e0742c660
commit f5be9661c4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/custom.js
View File

@@ -10,7 +10,7 @@ $(document).ready(function() {
alwaysVisible: false, alwaysVisible: false,
borderRadius: '0', borderRadius: '0',
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 25 touchScrollStep : 50
}); });
$('#order-detail-slimscroll').slimScroll({ $('#order-detail-slimscroll').slimScroll({
@@ -20,7 +20,7 @@ $(document).ready(function() {
alwaysVisible: false, alwaysVisible: false,
borderRadius: '0', borderRadius: '0',
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 25 touchScrollStep : 50
}); });
$('#menu-slimscroll').slimScroll({ $('#menu-slimscroll').slimScroll({
@@ -30,7 +30,7 @@ $(document).ready(function() {
alwaysVisible: false, alwaysVisible: false,
borderRadius: '0', borderRadius: '0',
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 25 touchScrollStep : 50
}); });
// $('.delete').click(function(){ // $('.delete').click(function(){

2
app/views/origami/home/show.html.erb
View File

@@ -300,7 +300,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]'
JSON.parse(order_item.set_menu_items).each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"> <br><span class="font-13">
<%= item_instance["item_instance_name"] %> <%= item_instance["item_instance_name"] %>

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

@@ -370,7 +370,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]'
JSON.parse(order_item.set_menu_items).each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"> <br><span class="font-13">
<%= item_instance["item_instance_name"] %> <%= item_instance["item_instance_name"] %>