Pull from master

2018-05-14 16:00:31 +06:30
parent 11bae95ac6
commit 916dbf2cd3
14 changed files with 173 additions and 139 deletions
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -17,7 +17,7 @@

            <span class="main_menu" id="main_menu menu_name" >
              <%if @menu.present? %>
-                  <%=menu[0].name%>
+                  <%=@menus[0].name%>
              <% end%>
            </span>
          </a>