Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/home_controller.rb

@@ -10,9 +10,13 @@ class HomeController < ApplicationController
     @login_form.emp_id = params[:login_form][:emp_id]
     @login_form.password = params[:login_form][:password]
     @employee = Employee.login(@login_form.emp_id, @login_form.password)
-    if @employee
+    puts @employee.role
+    if @employee.role == "administrator"
       session[:session_token] = @employee.token_session
       redirect_to dashboard_path
+    elsif @employee.role == "cashier"
+      session[:session_token] = @employee.token_session
+      redirect_to origami_root_path
     else
        render :index
     end

app/controllers/origami/payments_controller.rb

@@ -19,6 +19,7 @@ class Origami::PaymentsController < BaseOrigamiController
     if Sale.exists?(sale_id)
       @cash = 0.0
       @other = 0.0
+      @ppamount = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
 
       #get customer amount
@@ -55,8 +56,10 @@ class Origami::PaymentsController < BaseOrigamiController
          if spay.payment_method == "cash"
            @cash = spay.payment_amount
          end
-         if spay.payment_method == "mpu" || spay.payment_method == "paypar"
+         if spay.payment_method == "mpu"
            @other += spay.payment_amount
+         elsif spay.payment_method == "paypar"
+           @ppamount += spay.payment_amount
          end
       end
     end