From d59ff8c6eb7669d82c14294405460920f6072574 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 12:50:02 +0630
Subject: [PATCH 1/3] update show table for instance set

---
 app/views/origami/home/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b108c46d..494decbe 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -300,7 +300,7 @@
                                           <% 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| %> 
                                           <br><span class="font-13">
                                             <%= item_instance["item_instance_name"] %>

From 5155fd5221e866fc02c06a4a3c13c34ceea48495 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 13:09:16 +0630
Subject: [PATCH 2/3] update show table for instance set

---
 app/views/origami/rooms/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index e2f04018..5bc46c84 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -370,7 +370,7 @@
                           <% 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| %> 
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>

From 3e0742c66073b8f264678d59f70943beea9191a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 2 Apr 2018 14:06:22 +0630
Subject: [PATCH 3/3] reduce scroll speed in wIter app

---
 app/assets/javascripts/custom.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 778de553..c6e6a47b 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
 
   $('#order-detail-slimscroll').slimScroll({
@@ -20,7 +20,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
 
   $('#menu-slimscroll').slimScroll({
@@ -30,7 +30,7 @@ $(document).ready(function() {
     alwaysVisible: false,
     borderRadius: '0',
     railBorderRadius: '0',
-    touchScrollStep : 25
+    touchScrollStep : 50
   });
   
   // $('.delete').click(function(){