Pull from master

This commit is contained in:
San Wai Lwin
2018-04-02 18:10:47 +06:30
parent c53276f21c
commit 650eb53f51
19 changed files with 351 additions and 163 deletions

View File

@@ -100,8 +100,8 @@
$.ajax({
type: method,
url: url ,
success: function(data) {
location.href = data.url;
success: function(data) {
location.href = data.url;
}
});
} else {

View File

@@ -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"] %>

View File

@@ -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"] %>

View File

View File

@@ -62,9 +62,12 @@
<!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
<td>
<%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
</td>
</tr>
<% end %>
<a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="btn btn-primary btn-sm waves-effect" style="height: 33px;">
<i class="material-icons" style="top: 0px;">backup</i>
</a>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
@@ -101,3 +104,21 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$("#export-xlsx").on('click', function(){
var menu_id= $(this).attr('data-attr');
console.log(menu_id);
$.ajax({
type: "GET",
url: "/settings/menus/" + menu_id + "/export",
success: function(result){
if(result.status){
swal("Success", "Export Success...", "success");
}
}
});
});
});
</script>