From c037c8505531ee8d0c8e1532b4f87f530339e4b6 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 12 Jun 2018 17:11:43 +0630
Subject: [PATCH] Edit pagination

---
 app/assets/stylesheets/origami.scss           | 29 +++++++++++++++++++
 .../origami/customers_controller.rb           | 10 ++++---
 config/routes.rb                              |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 7ce4e1ed..3f46cb67 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -467,4 +467,33 @@ iframe {
 .tax-btn-box {
 	width: 230px; 
 	height: 80px;
+}
+
+/*Pagination*/
+nav.pagination {
+  margin:10px;
+
+}
+nav.pagination .current{
+  background-color:#1f91f3;
+  color:#fff;
+  padding:4px 10px;
+   margin-top:-4px;
+}
+nav.pagination .page a,.next a,.last a,.prev a,.first a{
+  padding:6.5px 10px;
+  margin-left: 3px;
+}
+
+nav.pagination .page a:hover,
+a:focus {
+  background-color: #ccc;
+  text-decoration: none;
+
+}
+nav.pagination .page a:hover,
+.first a:hover,.last a:hover,.prev a:hover,.next a:hover{
+  background-color: #ccc;
+  text-decoration: none;
+
 }
\ No newline at end of file
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index ec559870..e0e5c9ef 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -53,7 +53,7 @@ class Origami::CustomersController < BaseOrigamiController
     
     @sale_id             = params[:sale_id]
     @cashier_type        = params[:type]
-    @page                = params[:page]
+    @page                = params[:dir_page]
     
      if(@sale_id[0,3] == "SAL")
        @booking          = Booking.find_by_sale_id(@sale_id)
@@ -74,15 +74,17 @@ class Origami::CustomersController < BaseOrigamiController
     end       
 
     filter = params[:filter]
-    
+    puts "filter"
+    puts filter
     if filter.nil?
-      @crm_customers = Customer.order("customer_id").page(params[:page])
+      puts params[:page]
+      @crm_customers = Customer.order("customer_id") #.page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
     else
       @crm_customers = Customer.search(filter)       
     end
     #@crm_customers  = Customer.all
-    @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
+    @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(20)
     @crm_customer    = Customer.new
     @count_customer = Customer.count_customer
     
diff --git a/config/routes.rb b/config/routes.rb
index f2196b77..3cfb71de 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -231,7 +231,7 @@ scope "(:locale)", locale: /en|mm/ do
 
     #---------Add Customer --------------#
     #resources :customers
-    get '/:sale_id/:type/customers/:page', to: "customers#add_customer"
+    get '/:sale_id/:type/customers/:dir_page', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
     post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table