From 7f249feda25a26e527e924698ed5cabf54efb3d9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 5 Jun 2018 15:50:06 +0630
Subject: [PATCH] update origami dashboard

---
 app/controllers/home_controller.rb            |  2 +-
 .../origami/dashboard_controller.rb           | 37 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

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)