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

21
app/views/settings/menus/index.html.erb
View File

@@ -1,12 +1,19 @@
<% breadcrumb_add t('menus'), "", 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("en.menus") %></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-2 col-lg-2">
<br><br>
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
@@ -21,7 +28,7 @@
<%= form_tag import_settings_menus_path,class:"col-md-", multipart:true do%>
<%=file_field_tag :file, :class => "img-thumbnail col-md-7" %>
<%=submit_tag "Import",:class => 'btn btn-primary btn-lg waves-effect' %>
<%end%>
<%end%>
</div>
<%= link_to t("views.btn.new"),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
@@ -64,7 +71,7 @@
</tbody>
</table>
</div>
<%= paginate @settings_menus, param_name: :page, :outer_window => 3 %>
<%= paginate @settings_menus, param_name: :page, :outer_window => 3 %>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card">
@@ -94,7 +101,7 @@
8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>
@@ -102,7 +109,7 @@
$(document).ready(function(){
$(".export-xlsx").on('click', function(){
var menu_id= $(this).attr('data-attr');
$.ajax({
type: "GET",
url: "/settings/menus/" + menu_id + "/export",

13
app/views/settings/menus/new.html.erb
View File

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

19
app/views/settings/menus/show.html.erb
View File

@@ -1,10 +1,19 @@
<% breadcrumb_add t('menus'), settings_menus_path, settings_menus_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_menus_path %>"><%= t("en.menus") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to 'Back', settings_menus_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
@@ -25,7 +34,7 @@
<th><%= t("views.right_panel.detail.valid_from") %></th>
<th><%= t("views.right_panel.detail.valid_to") %></th>
<th><%= t("views.right_panel.detail.created_by") %></th>
<th><%= t("views.right_panel.detail.created_at") %></th>
<th><%= t("views.right_panel.detail.created_at") %></th>
<th><%= t("views.right_panel.detail.actions") %></th>
</tr>
</thead>
@@ -44,7 +53,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>
@@ -138,6 +147,6 @@
8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>