remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -88,13 +88,13 @@
                  <span class="order-qty">
                    <%= qid.qty %>
                  </span> ]  
-                  <% if !qid.set_menu_items.nil? 
-                      qid.set_menu_items.each do |item_instance|%>
-                    <br><span class="font-12">
+                  <% if !qid.set_menu_items.nil? %>
+                    <% qid.set_menu_items.each do |item_instance|%>
+                      <br><span class="font-12">
                      <%= item_instance %>
-                    </span>
-                  <% end 
-                  end %> 
+                      </span>
+                    <% end %>
+                  <% end %> 
                </p>                  
                
                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>