diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index e14cc205..f81daaa3 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -157,15 +157,3 @@ $(document).ready(function() {
    }
   //end Notificaiotn message
 });
-
-/* start order reservation function */
-function audioPlayBackground(shop_code,audio){
-  // console.log(shop_code);
-  //audio play
-  var audio = new Audio('/'+audio); // define your audio
-  // setTimeout(function(){
-    // audio.loop = true;
-    audio.play();
-  // },10000);
-}
-/* end order reservation function */
diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index f187a2db..4c2958ec 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -579,4 +579,16 @@ function timeFormat(date){
          (isPM ? ' PM' : ' AM');
   return time;
 }
+/* end order reservation function */
+
+/* start order reservation function */
+function audioPlayBackground(shop_code,audio){
+  // console.log(shop_code);
+  //audio play
+  var audio = new Audio('/'+audio); // define your audio
+  // setTimeout(function(){
+    // audio.loop = true;
+    audio.play();
+  // },10000);
+}
 /* end order reservation function */
\ No newline at end of file
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 67911d9e..32c7f81e 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -15,7 +15,6 @@
 //= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
-//= require order_reservation.js
 
 /* Constant Varaibles */
 _CREDIT_PAYMENTS_	= "/   CREDIT PAYMENTS";
diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 6d323f52..9fb392fe 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -14,14 +14,20 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 		end
 
 		if status
-			check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal')
-			if !check_customer.nil?
-			  customer_id = check_customer.customer_id
+			if params[:customer_id] && !params[:customer_id].nil?
+				customer = OrderReservation.addCustomer(params)
+				customer_id = customer.customer_id
 			else
-			  customer = OrderReservation.addCustomer(params)
-			  customer_id = customer.id
+				check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal')
+				if !check_customer.nil?
+				  customer_id = check_customer.customer_id
+				else
+				  customer = OrderReservation.addCustomer(params)
+				  customer_id = customer.customer_id
+				end
 			end
-			if !customer_id.nil? 
+			
+			if customer_id.nil? 
 				render :json => { :status => false, :message => "email and customer are already existed!"  }
 			else
 				render :json => { :status => true, :data => { :customer_id => customer_id} }
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index e23da859..325cb241 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -67,7 +67,7 @@ class HomeController < ApplicationController
           redirect_to origami_root_path
         elsif @employee.role == "waiter"
           session[:session_token] = @employee.token_session
-          redirect_to origami_dashboard_path
+          route_by_role(@employee)
         elsif @employee.role == "account"
           session[:session_token] = @employee.token_session
           redirect_to reports_dailysale_index_path
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index a633c9e1..ab7bde82 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -25,15 +25,18 @@ class Origami::DashboardController < BaseOrigamiController
 
     @sale_data = Array.new
     @total_payment_methods = Sale.total_payment_methods(today,current_user)
-
-    @total_payment_methods.each do |payment|
-      if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
-        pay = Sale.payment_sale('card', today, current_user)
-        @sale_data.push({'card' => pay.payment_amount})
-      else 
-        pay = Sale.payment_sale(payment.payment_method, today, current_user)
-        @sale_data.push({payment.payment_method => pay.payment_amount})
-      end
+    if !@total_payment_methods.nil?
+        @total_payment_methods.each do |payment|
+          if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
+            pay = Sale.payment_sale('card', today, current_user)
+            @sale_data.push({'card' => pay.payment_amount})
+          else 
+            pay = Sale.payment_sale(payment.payment_method, today, current_user)
+            @sale_data.push({payment.payment_method => pay.payment_amount})
+          end
+        end
+    else
+        @sale_data = nil
     end
     @summ_sale              = Sale.summary_sale_receipt(today,current_user)
     @total_customer         = Sale.total_customer(today,current_user)
@@ -45,12 +48,16 @@ class Origami::DashboardController < BaseOrigamiController
     @total_order            = Sale.total_order(today,current_user)
     @total_accounts         = Sale.total_account(today,current_user)
     @account_data = Array.new
-    @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today,current_user)
-      if !acc.nil?
-        @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
-      end
-    end
+    if !@total_accounts.nil?
+         @total_accounts.each do |account|
+          acc = Sale.account_data(account.account_id, today,current_user)
+          if !acc.nil?
+            @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
+          end
+        end
+    else
+        @account_data = nil
+    end   
 
     @top_items         = Sale.top_items(today,current_user)
     @total_foc_items   = Sale.total_foc_items(today,current_user) 
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 4e9235dc..e901021a 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -22,7 +22,11 @@ class OrderReservation < ApplicationRecord
 		else
 		  gender = "Male"
 		end
-		customer = Customer.new
+		if params[:customer_id] && !params[:customer_id].nil?
+			customer = Customer.find(params[:customer_id])
+		else
+			customer = Customer.new
+		end
 		customer.name             = params[:name]
 		customer.email            = params[:email]
 		customer.contact_no       = params[:contact_no] ? params[:contact_no] : ''
@@ -33,7 +37,6 @@ class OrderReservation < ApplicationRecord
 		customer.customer_type    = "Doemal"
 		customer.tax_profiles     = ["2"]
 		customer.save
-
 		# unless customer.valid?
 		#     render json: {
 		#       status: 422,
diff --git a/config/routes.rb b/config/routes.rb
index 8c6a5e0c..f2196b77 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -197,7 +197,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/voucher' => 'voucher_payments#create'
     post 'payment/paymal' => 'paymal#create'
     post 'payment/alipay' => 'alipay#create'
-    post 'payment/junctionpay' => 'junctionpay#create'
+    post 'payment/junctionpay' => 'junction_pay#create'
     post 'payment/dinga' => 'dinga#create'
     post 'payment/gift_voucher' => 'gift_voucher#create'