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

app/views/origami/addorders/detail.html.erb

@@ -375,7 +375,7 @@
             <div class="modal-body">
                 <div class="row set-item">
                   <div class="col-md-4">
-                  <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
+                  <p class="set_default_option" style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
                       <!-- <div class="form-group">
                         <label class="col-md-6" style="margin-top:5px">Quantity</label>
                         <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">

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>