diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 0af08e5d..21c2d373 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -6,8 +6,13 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers.json def index filter = params[:filter] + filter_card_no = params[:filter_card_no] type = params[:type] - if filter.nil? + if filter_card_no=="" + @crm_customers = Customer.all + elsif !filter_card_no.nil? + @crm_customers=Customer.where("card_no=?",filter_card_no) + elsif filter.nil? || filter_card_no=="" @crm_customers = Customer.all else @crm_customers = Customer.search(filter) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index b949291b..76d1dce8 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -15,7 +15,7 @@
-
+
<%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
@@ -32,6 +32,20 @@
<% end %>
+
+ <%= form_tag crm_customers_path, :method => :get do %> +
+
+ +
+
+ + + +
+
+ <%end %> +
diff --git a/config/license.yml b/config/license.yml new file mode 100644 index 00000000..42f5be11 --- /dev/null +++ b/config/license.yml @@ -0,0 +1,15 @@ +iv_key: 0zVzQvzlcJhc1d1EuA2HRg== +shop_name: aungcafe +email: devops@code2lab.com +telephone: +fax: +address: +dbhost: NGg7s8bJBfbDrkIeQhV+obOyEtgxtI3Dvf+b+eBm0P+r3aT+dBqHnwVEaIwsafXPFNXavhR/C0iyni1Lszkfyw== +dbschema: X+F4yj1eQlGPiMtsgZQCqWi2NIdBLUCEj35vF4XQDZc= +dbusername: 5CSlQR48ZAiRwWlTxzOZcw== +dbpassword: uzPlzsPjbWhJHcbStJSS0A== +api_token: RaZKWQwnKpvbdJvyAiMGGZPUKuJkWbE +app_token: dCKGOGvdFsCzOUrvhdrFqoOaAUzwtEUC +plan_sku: Qy0IoCIrNawRA2WjS3aLPg== +renewable_date: vGwTpixrL9biHkxdRdGctA== +plan_name: E9Njdqdou4eMpPaWDevpT95fpksDti2xvY+0u3PzKp0= diff --git a/config/puma.rb b/config/puma.rb index 774272b7..a50fe4ad 100755 --- a/config/puma.rb +++ b/config/puma.rb @@ -8,4 +8,3 @@ # port ENV.fetch("PORT") { 62158 } # workers 2 # preload_app! -