Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/assets/stylesheets/origami.scss

@@ -468,3 +468,32 @@ iframe {
 	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;
+
+}

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
     

app/views/origami/home/show.html.erb

@@ -494,7 +494,7 @@
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button> -->
                   <% if current_login_employee.role == "cashier" %>
                     <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"   data-type="edit">Edit</a> 
-                    <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+                    <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
                   <% else %>
                     <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                     <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>

app/views/origami/rooms/show.html.erb

@@ -469,7 +469,7 @@
           <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
           <% if current_login_employee.role == "cashier" %>
           <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"   data-type="edit">Edit</a> 
-          <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+          <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
           <% else %>
           <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
            <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>

app/views/origami/sales/show.html.erb

@@ -258,7 +258,7 @@
   <% if @sale.sale_status != 'void' && @sale.sale_status != 'waste' && @sale.sale_status != 'spoile' %>
      <% if current_login_employee.role == "cashier" %>
         <a class="btn btn-block bg-danger waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
-        <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="reprint"> Re.Print</a>
+        <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="reprint"> Re.Print</a>
      <% else %>      
            <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>   
            <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>   

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