fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -103,11 +103,6 @@ class Crm::CustomersController < BaseCrmController
        end
      end
    end
-
-    # if flash["errors"]
-    #   @crm_customer.valid?
-    # end
-    # puts @crm_customers.to_json
    respond_to do |format|
      format.html # index.html.erb
      format.json { render json: @crm_customers }