git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'crm'

Browse Source
This commit is contained in:
Aung Myo
2017-06-13 20:13:01 +06:30
parent 2e316f46fe b86ae8d32d
commit 7057e320cf
6 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/origami/customers_controller.rb
View File

@@ -17,12 +17,17 @@ class Origami::CustomersController < BaseOrigamiController
@sale_id = params[:sale_id]
filter = params[:filter]
filter = params[:filter]
if filter.nil?
@crm_customers = Customer.order("name").page params[:page]
@crm_customers = Customer.order("customer_id").page(params[:page])
#@products = Product.order("name").page(params[:page]).per(5)
else
@crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page params[:page]
@crm_customers = Customer.search(filter)
end
# @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2)
#@crm_customers = Customer.all
@crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
@crm_customer = Customer.new
if flash["errors"]