conflict file

app/views/api/bookings/show.json.jbuilder

@@ -13,7 +13,6 @@ if (@booking)
   @total_amount = 0.00
   @total_tax = 0.00
   
-  @booking_orders = BookingOrder.where("booking_id = #{@booking.booking_id}").all;
   if @booking.booking_orders
     order_items = []
     @booking.booking_orders.each do |bo|

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>

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| %>