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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
parent 7dfcff5af5 5e8f08315c
commit b730da7a75
184 changed files with 2672 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/print_settings/edit.html.erb
View File

@@ -1,3 +1,12 @@
<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"><a href="<%= print_settings_path %>"><%= t("views.right_panel.header.print_settings") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %>
</span>
</ol>
</div>
<%= render 'form', print_setting: @print_setting %>

18
app/views/print_settings/index.html.erb
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>

14
app/views/print_settings/new.html.erb
View File

@@ -1,4 +1,12 @@
<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"><a href="<%= print_settings_path %>"><%= t("views.right_panel.header.print_settings") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %>
</span>
</ol>
</div>
<%= render 'form', print_setting: @print_setting %>

21
app/views/print_settings/show.html.erb
View File

@@ -1,4 +1,13 @@
<% breadcrumb_add t("views.right_panel.header.print_settings"), print_settings_path, print_settings_path, t('details') %>
<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"><a href="<%= print_settings_path %>"><%= t("views.right_panel.header.print_settings") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="card">
@@ -68,7 +77,7 @@
<span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6>
<h6>This action can't be undo. </h6>
<h6>This action can't be undo. </h6>
</span>
</td>
</tr>
@@ -83,7 +92,7 @@
<div class="body">
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
<p>
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
2) <%= t("views.right_panel.detail.unique_code") %> - <%= t("views.right_panel.detail.unique_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
3) <%= t("views.right_panel.detail.template") %> - <%= t("views.right_panel.detail.template_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
4) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.printer_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
@@ -104,10 +113,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>