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

11
app/views/settings/tax_profiles/edit.html.erb
View File

@@ -1 +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="<%= settings_tax_profiles_path %>"><%= t("en.tax_profile") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
<span class="float-right">
<%= link_to 'Back', settings_tax_profiles_path %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_tax_profile: @settings_tax_profile %>

16
app/views/settings/tax_profiles/index.html.erb
View File

@@ -1,5 +1,13 @@
<% breadcrumb_add t('tax_profile'), '', 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"><%= t("en.settings") %></li>
<li class="breadcrumb-item active"><%= t("en.tax_profile") %></li>
<span class="float-right">
<%= link_to 'Back', root_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm''-12 col-md-9 col-lg-9">
<div class="m-b-10 clearfix">
@@ -60,6 +68,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>
</div>

12
app/views/settings/tax_profiles/new.html.erb
View File

@@ -1,2 +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="<%= settings_tax_profiles_path %>"><%= t("en.tax_profile") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right">
<%= link_to 'Back', settings_tax_profiles_path %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_tax_profile: @settings_tax_profile %>

16
app/views/settings/tax_profiles/show.html.erb
View File

@@ -1,4 +1,13 @@
<% breadcrumb_add t('tax_profile'), settings_tax_profiles_path, settings_tax_profiles_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="<%= settings_tax_profiles_path %>"><%= t("en.tax_profile") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
@@ -45,7 +54,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>
@@ -59,7 +68,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.tax_profiles_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.tax_profiles_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
2) <%= t("views.right_panel.detail.rate") %> - <%= t("views.right_panel.detail.rate_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
3) <%= t("views.right_panel.detail.inclusive") %> - <%= t("views.right_panel.detail.inclusive_txt") %> <%= t("views.right_panel.detail.tax_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
@@ -79,4 +88,3 @@
</div>
</div>
</div>