Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
184 changed files with 2672 additions and 1021 deletions

View File

@@ -1,9 +1,16 @@
<p id="notice"><%= notice %></p>
<% breadcrumb_add t("views.right_panel.header.print_settings"), "", dashboard_path %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("views.right_panel.header.print_settings") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
@@ -43,7 +50,7 @@
<!-- <td><%= print_setting.delimiter %></td> -->
<!-- <td><%= print_setting.heading_space %></td> -->
<td>
<%= link_to t("views.btn.show"), print_setting,:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to t("views.btn.show"), print_setting,:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_print_setting_path(print_setting),:class => 'btn btn-info btn-sm waves-effect' %></td>
</tr>
<% end %>
@@ -77,7 +84,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>