remove confilct data

2018-05-14 10:17:26 +06:30
parent 5d82a0c9ad 9900ea385a
commit 6e5064cf9f
115 changed files with 5075 additions and 2409 deletions
--- a/app/views/crm/customers/show.json.jbuilder
+++ b/app/views/crm/customers/show.json.jbuilder
@@ -1,4 +1,4 @@
 json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth,
                             :membership_id, :membership_type, :membership_authentication_code,
-                             :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :tax_profiles
+                             :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :image_path, :tax_profiles
 json.url crm_customer_url(@crm_customer, format: :json)