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-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/layouts/CRM.html.erb
View File

@@ -31,6 +31,7 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' if Rails.env.production? %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>

15
app/views/layouts/OQS.html.erb
View File

@@ -35,24 +35,25 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' if Rails.env.production? %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
<!-- #END# Overlay For Sidebars -->
<%= render 'layouts/header' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
</section>
<!-- Main Content -->
<section class="content">
<section class="content">
<% flash.each do |type, message| %>
<div class="alert fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%= message %>
</div>
<% end %>
<%= yield %>
<% end %>
<%= yield %>
</section>
</body>
</body>

12
app/views/layouts/_left_sidebar.html.erb
View File

@@ -51,8 +51,18 @@
<% end %>
<% if can? :index, :home %>
<% if current_login_employee.role != "kitchen" %>
<% if current_user.role == "cashier"
shift = ShiftSale.current_open_shift(current_user)
if !shift.nil?
path = origami_dashboard_path
else
path = new_origami_shift_path
end
else current_user.role == "administrator"
path = origami_dashboard_path
end %>
<li class="menu-up">
<a href="<%= origami_dashboard_path %>">
<a href="<%= path %>">
<i class="material-icons">monetization_on</i>
<span><%= t :origami %></span>
</a>

3
app/views/layouts/application.html.erb
View File

@@ -32,6 +32,8 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' if Rails.env.production? %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
@@ -39,7 +41,6 @@
<%= render 'layouts/header' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
</section>

10
app/views/layouts/installation.html.erb
View File

@@ -10,34 +10,34 @@
<%= csrf_meta_tags %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<style>
.page {
padding-left: 0;
max-width: 80%;
margin: 2% auto;
overflow-x: hidden;
overflow-x: hidden;
background-color: #2790a5;
}
.page .box {
display: block;
width: 100%;
color: #000;
color: #000;
}
</style>
</head>
<body class="page">
<% flash.each do |type, message| %>
<% if type == "notice"
<% if type == "notice"
color = "alert-success"
elsif type == "error"
color = "alert-danger"
else
color = "bg-black"
end %>
<p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>

11
app/views/layouts/inventory.html.erb
View File

@@ -31,14 +31,15 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' if Rails.env.production? %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
<!-- #END# Overlay For Sidebars -->
<%= render 'layouts/header' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
</section>
<!-- Main Content -->
@@ -54,8 +55,8 @@
<% end %>
<%= render_breadcrumb %>
<%= yield %>
<%= yield %>
</section>
</body>
</html>
</html>

18
app/views/layouts/origami.html.erb
View File

@@ -31,14 +31,15 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' if Rails.env.production? %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
<!-- #END# Overlay For Sidebars -->
<%= render 'layouts/header' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
<section>
<%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %>
</section>
<!-- Notify -->
@@ -46,21 +47,20 @@
<!-- Notify -->
<!-- Main Content -->
<section class="content">
<section class="content">
<% flash.each do |type, message| %>
<% if type == "notice"
<% if type == "notice"
color = "alert-success"
elsif type == "error"
color = "alert-danger"
else
color = "bg-black"
end %>
<p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
<%= yield %>
<% end %>
<%= yield %>
</section>
</body>

1
app/views/layouts/waiter.html.erb
View File

@@ -14,6 +14,7 @@
</head>
<body>
<%= render 'shared/license_expire_warning' %>
<%= render 'layouts/header' %>
<div class="container-fluid">
<% flash.each do |type, message| %>