origin pull master

This commit is contained in:
Aung Myo
2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions

View File

@@ -1,6 +1,14 @@
<h1>Editing Settings Order Queue Station</h1>
<!-- <h1>Editing Settings Order Queue Station</h1>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %> -->
<%= link_to 'Show', @settings_order_queue_station %> |
<%= link_to 'Back', settings_order_queue_stations_path %>
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %>
</div>

View File

@@ -1,3 +1,11 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
<li>Order Queue Station</li>
</ul>
</div>
<p id="notice"><%= notice %></p>
<p>