Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
184 changed files with 2672 additions and 1021 deletions

View File

@@ -1,4 +1,13 @@
<% breadcrumb_add t('queue'), "", dashboard_path %>
<div class="container-fluid">
<div class="page-header">
<ul 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.queue") %></li>
<span class="float-right">
<%= link_to 'Back', root_path %>
</span>
</ul>
</div>
<div class="row">
<!-- Column One -->
@@ -9,7 +18,7 @@
<div class="body">
<% if @dining_queues.count > 0 %>
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @dining_queues.each do |queue| %>
<% if queue.status == "Assign"
@bg_color = "assign"
@@ -42,7 +51,7 @@
</div>
</div>
<% end %>
</div>
<% else %>
<p>There is no queue Now !</p>
@@ -58,25 +67,25 @@
<h6><i class="material-icons md-18">view_headline QUEUE DETAILs</i> </h6>
<p>
1) Latest Queue No - <%= @complete_queue.last.queue_no rescue 0 %> <br>
2) Next Queue No - <% @next = (@complete_queue.last.queue_no.to_i rescue 0) + 1%>
2) Next Queue No - <% @next = (@complete_queue.last.queue_no.to_i rescue 0) + 1%>
<%= @next rescue 0 %> <br>
3) Today Completed Queue - <strong> <%= @complete_queue.count %> </strong><br>
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
<p>
1) <%= t("views.right_panel.button.cancel") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.cancel_btn_txt") %>
1) <%= t("views.right_panel.button.cancel") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.cancel_btn_txt") %>
<%= t("views.right_panel.detail.queue_txt") %> <br>
2) <%= t("views.btn.new") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.create_btn_txt") %>
2) <%= t("views.btn.new") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.create_btn_txt") %>
<%= t("views.right_panel.detail.queue_txt") %><br>
2) <%= t("views.btn.assign") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.assign_txt") %>
2) <%= t("views.btn.assign") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.assign_txt") %>
<%= t("views.right_panel.detail.queue_txt") %><br>
</p>
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
@@ -85,7 +94,7 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.home_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block', 'data-no-turbolink' => true %>
@@ -157,4 +166,4 @@ function cancel_queue(id,url) {
-moz-column-count: 4;
column-count: 4;
}
</style>
</style>