diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 7f9192f2..ec599464 100755 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -6,9 +6,6 @@ @import "sweetalert/sweetalert.css"; @import "multi-select/css/multi-select.css"; @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker"; -@import "jquery-ui/jquery-ui.css"; -@import "jquery-ui/jquery-ui.structure.css"; -@import "jquery-ui/jquery-ui.theme.css"; @import "morrisjs/morris"; @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index c61100bb..f95b54a9 100755 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -33,7 +33,7 @@ class Crm::CustomersController < BaseCrmController end end end - @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(5) + @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(20) @crm_customer = Customer.new @count_customer = Customer.count_customer