diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb
index 2d3a819e..35cefe6f 100644
--- a/app/controllers/transactions/orders_controller.rb
+++ b/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 }
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index c8ecb725..b1c28e98 100644
--- a/app/controllers/transactions/sales_controller.rb
+++ b/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 }
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 67953c14..dee4c2f7 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -57,10 +57,9 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier by current login
-      # TODO: requested_by is string , can't cast to id. error occur. please fix
-      # self.cashier_id = requested_by.id
-      self.cashier_name = requested_by
-      self.requested_by = requested_by
+      self.cashier_id = requested_by.id
+      self.cashier_name = requested_by.name
+      self.requested_by = requested_by.name
 
       self.requested_at = DateTime.now.utc
 
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index a50bf56b..ee82eb8b 100644
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -57,7 +57,7 @@
             </tbody>
           </table>
           <br>
-          
+           <%= paginate @sales %>
         </div>
       </div>