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

13
app/views/settings/order_queue_stations/edit.html.erb
View File

@@ -1 +1,12 @@
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
<li class="breadcrumb-item active">Edit</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>

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

@@ -1,4 +1,12 @@
<% breadcrumb_add t("views.right_panel.header.order_queue_stations"), "", 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("views.right_panel.header.order_queue_stations") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), root_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
@@ -31,7 +39,7 @@
<td><%= settings_order_queue_station.is_active %></td>
<td><%= settings_order_queue_station.auto_print %></td>
<td><%= settings_order_queue_station.print_copy %></td>
<!-- <td><%= settings_order_queue_station.cut_per_item %></td> -->
<td><%= settings_order_queue_station.use_alternate_name %></td>
<!-- <td><%= settings_order_queue_station.created_by %></td> -->
@@ -41,7 +49,7 @@
<%= link_to 'Assign Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => 'btn btn-success btn-sm waves-effect' %>
&nbsp;&nbsp;
<%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %>
</td>
</tr>
<% end %>
@@ -75,6 +83,6 @@
1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
</div>
</div>
</div>
</div>
</div>

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

@@ -1 +1,12 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>

2
app/views/settings/order_queue_stations/show.html.erb
View File

@@ -1,7 +1,7 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>"><%= t("views.right_panel.header.order_queue_stations") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">