Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-03-16 18:07:46 +06:30
parent 7f6676c840 919846ef5c
commit 7524ab75ad
14 changed files with 84 additions and 183 deletions
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -7,6 +7,11 @@
    </span>
  </ol>
 </div>
+<!-- <h4>Import</h4>
+<%= form_tag import_settings_menus_path, multipart:true do%>
+  <%=file_field_tag :file%>
+  <%=submit_tag "Import CSV"%>
+<%end%> -->
 <div class="row">
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <br><br>