merge with origin master

app/controllers/home_controller.rb

@@ -10,6 +10,7 @@ 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)
+<<<<<<< HEAD
 
     if @employee != nil
       if @employee.role == "administrator"
@@ -24,6 +25,17 @@ class HomeController < ApplicationController
     else 
       redirect_to origami_root_path, :notice => "Username and Password dosn't match!"
     end 
+=======
+    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
+>>>>>>> 7dffd668eaee6ab82621fd4bae150525ded79df1
 
   end
 

app/controllers/transactions/orders_controller.rb

@@ -13,7 +13,7 @@ class Transactions::OrdersController < ApplicationController
 		        
 		    end    
 		end    
-		    @orders = Kaminari.paginate_array(orders).page(params[:page]).per(2)
+		    @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50)
 			    respond_to do |format|
 			    format.html # index.html.erb
 			    format.json { render json: @orders }

app/controllers/transactions/sales_controller.rb

@@ -10,12 +10,18 @@ class Transactions::SalesController < ApplicationController
     today       = Date.today
     
     if receipt_no.nil?
-      @sales = Sale.order("sale_id")
-      #@products = Product.order("name").page(params[:page]).per(5)
+        sales = Sale.order("sale_id desc")
     else
-      @sales = Sale.search(receipt_no)    
-    end
-    @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+        order = Sale.search(receipt_no)
+        if order.count > 0
+          sales = order 
+        else
+          sales = Sale.order("sale_id desc")
+            
+        end    
+    end    
+    @sales = Kaminari.paginate_array(sales).page(params[:page]).per(50)
+
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }