conflict file

2017-06-06 14:49:25 +06:30
parent e76296bb77 d2ce74f648
commit 8fd23bfd87
10 changed files with 48 additions and 16 deletions
--- a/app/views/crm/customers/_form.html.erb
+++ b/app/views/crm/customers/_form.html.erb
@@ -8,7 +8,7 @@
    <%= f.input :contact_no %>
    <%= f.input :email %>
    <%= f.input :date_of_birth %>
-    
+    <%= f.input :membership_id, :collection => @membership %> 
    <%= f.input :membership_type %>
    <%= f.input :membership_authentication_code %>
  </div>
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -71,6 +71,7 @@
      <div class="form-group">
       <%= f.select :membership_id, options_for_select(@membership.collect { |member|
    [member["name"], member["id"]] }, 1), {}, { id: 'countries_select' } %>
+
         <select class="selectpicker form-control col-md-6" name="membership_id">
            <option>Select Member Group</option>
            <% @membership.each do |member| %>