fixed conflictfile

2017-06-12 15:01:19 +06:30
parent e90178cfdc 105581a7de
commit dc51beae43
30 changed files with 699 additions and 353 deletions
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -94,13 +94,11 @@ class Crm::CustomersController < BaseCrmController
          else
              
              @crm_customers.destroy
-
              if params[:sale_id]
                format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
              else
                format.html { redirect_to crm_customers_path, notice: response["message"] }
              end
-
          end
      else

@@ -110,7 +108,6 @@ class Crm::CustomersController < BaseCrmController
            format.html { redirect_to crm_customers_path}
            format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
          end
-      
      end

  end