git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with origin and add localize

Browse Source
This commit is contained in:
Yan
2017-10-13 17:07:17 +06:30
parent 1ba68cd152
commit bfe3727e7d
41 changed files with 91 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/settings/set_menu_items/show.html.erb
View File

@@ -50,7 +50,7 @@
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.min_qty %></td>
<td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %></td>
</tr>
</tbody>
</table>
@@ -61,7 +61,7 @@
<div class="card-block">
<h4 class="card-title">Menu Item Instances
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
<%= link_to t("views.btn.new"),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
@@ -93,8 +93,8 @@
<td><%= settings_menu_item.promotion_price %></td>
<!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
<td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
<%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
</tr>
<% end %>
</tbody>