update conflict

2017-07-31 19:39:50 +06:30
parent 2d6841a4c4 a57831a3fc
commit efa0f4cbfb
3 changed files with 206 additions and 184 deletions
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -156,7 +156,6 @@ class Crm::CustomersController < BaseCrmController
                    else
                      format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] }
                    end
-                    
                  end

                  if params[:sale_id]
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -409,7 +409,6 @@ class SalePayment < ApplicationRecord

        end
        rebate_arr.push(data)
-
      end
    
   		total_amount = rebate_prices - payparcost - overall_dis