From 0c82c162935a874d9e4648dbdf3d6ad015743156 Mon Sep 17 00:00:00 2001
From: PhyoTheingi <phyo.theingi@code2lab.com>
Date: Fri, 2 Jun 2017 11:38:46 +0630
Subject: [PATCH] Order Queue Station Bug Fix

---
 .../settings/order_queue_stations_controller.rb  |  6 +++---
 .../settings/order_queue_stations/edit.html.erb  | 16 ++++++++++++----
 .../settings/order_queue_stations/show.html.erb  |  8 ++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index ec85e56a..e0cf0d08 100644
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -1,5 +1,5 @@
 class Settings::OrderQueueStationsController < ApplicationController
-  before_action :set_settings_order_queue_station, only: [:show, :edit,:new, :update, :destroy]
+  before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy]
 
   # GET /settings/order_queue_stations
   # GET /settings/order_queue_stations.json
@@ -25,10 +25,10 @@ class Settings::OrderQueueStationsController < ApplicationController
   # POST /settings/order_queue_stations.json
   def create
     @settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
-
+    @settings_order_queue_station.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_order_queue_station.save
-        format.html { redirect_to @settings_order_queue_station, notice: 'Order queue station was successfully created.' }
+        format.html { redirect_to settings_order_queue_stations_path, notice: 'Order queue station was successfully created.' }
         format.json { render :show, status: :created, location: @settings_order_queue_station }
       else
         format.html { render :new }
diff --git a/app/views/settings/order_queue_stations/edit.html.erb b/app/views/settings/order_queue_stations/edit.html.erb
index af08ffda..27cf2fc8 100644
--- a/app/views/settings/order_queue_stations/edit.html.erb
+++ b/app/views/settings/order_queue_stations/edit.html.erb
@@ -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>
\ No newline at end of file
diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb
index 00004528..1a80c2c0 100644
--- a/app/views/settings/order_queue_stations/show.html.erb
+++ b/app/views/settings/order_queue_stations/show.html.erb
@@ -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>