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

12
app/views/settings/menu_item_instances/edit.html.erb
View File

@@ -1,3 +1,15 @@
<!-- <h1>Editing Settings Menu Item</h1>-->
<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_menu_category_simple_menu_item_path(@category,@item) %>"><%= t("views.right_panel.header.menu_item_instances") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
<span class="float-right">
<%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>

11
app/views/settings/menu_item_instances/new.html.erb
View File

@@ -1,3 +1,14 @@
<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_menu_category_simple_menu_item_path(@category,@item) %>"><%= t("views.right_panel.header.menu_item_instances") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right">
<%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
<script>

30
app/views/settings/menu_item_instances/show.html.erb
View File

@@ -1,6 +1,14 @@
<% breadcrumb_add t("views.right_panel.header.menu_item"),settings_menu_category_simple_menu_item_path(@category,@item),
settings_menu_category_simple_menu_item_path(@category,@item),
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_menu_category_simple_menu_item_path(@category,@item) %>"><%= t("views.right_panel.header.menu_item") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
@@ -9,7 +17,7 @@
<h4 class="card-title"><%= t("views.right_panel.header.menu_item_instances") %></h4>
<table class="table">
<tbody>
<tr><th><%= t("views.right_panel.detail.item_instance_code") %></th>
<td><%= @settings_menu_item_instances.item_instance_code %></td>
</tr>
@@ -31,11 +39,11 @@
<tr><th><%= t("views.right_panel.detail.is_default") %></th>
<td><%= @settings_menu_item_instances.is_default %></td>
</tr>
<tr><th><%= t("views.right_panel.detail.created_at") %></th>
<tr><th><%= t("views.right_panel.detail.created_at") %></th>
<td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
</tr>
</tbody>
</tbody>
</table>
<% if params[:simple_menu_item_id] %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
@@ -44,7 +52,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>
<% else %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
@@ -53,7 +61,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>
<% end %>
</div>
@@ -64,7 +72,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.item_instance_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
1) <%= t("views.right_panel.detail.item_instance_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
3) <%= t("views.right_panel.detail.price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
4) <%= t("views.right_panel.detail.is_on_promotion") %> - <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.is_on_promotion_txt") %> <br>
@@ -83,6 +91,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>