fixed fonflict

app/views/origami/customers/index.html.erb

@@ -2,12 +2,6 @@
   <div class="col-lg-12">
     <ol class="breadcrumb">
        <li><a href="<%= crm_root_path %>">Home</a></li>
-      <!--  <li class="active">
-           <a href="<%= crm_customers_path %>">Customer</a>
-       </li> -->
-       <!-- <a href="<%= new_crm_customer_path%>" class="btn btn-primary pull-right">
-        <i class="fa fa-plus-circle fa-lg"></i> Add Customer
-       </a> -->
     </ol>
   </div>
 </div>
@@ -15,11 +9,11 @@
 
 <div class="row">
   <div class="col-lg-7 col-md-7 col-sm-7">
-      
+
       <div class="main-box-body clearfix">
         <div class="table-responsive">
           <table class="table table-striped">
-           
+
             <thead>
 
               <tr>
@@ -47,7 +41,7 @@
               <% if @crm_customers.count > 0  %> 
               <% @i = 0 %>
                  <% @crm_customers.each do |crm_customer| %>
-                 <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
+                 <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
                      <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
@@ -56,8 +50,8 @@
                       <td><%= crm_customer.company rescue '-' %></td>
                       <td><%= crm_customer.contact_no %></td>
                       <td><%= crm_customer.email %></td>
-                      
-                     
+
+
                     </tr>
                     <% end %>
                   <% end %>
@@ -67,7 +61,7 @@
             </tbody>
           </table>
           <br>
-          
+
           <%= paginate @crm_customers %>
         </div>
       </div>
@@ -145,7 +139,6 @@
 
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
-   
       <% flash.each do |name, msg| %>
          <% str="[\"#{msg['contact_no']}\"]"
             str.gsub!('["', '')
@@ -174,7 +167,7 @@
       <option value="<%= member.value %>">
         <%= member.name %></option>
         <%end %>
-      </select>    
+      </select>
     </div>
 
     <div class="form-group">
@@ -214,13 +207,13 @@
               // var url = "/"+customer_id;
               update_sale(customer_id,sale_id);
             }else{
-              
+
               var url = "customers/"+customer_id;
             }
-              
-              $.ajax({      
-                type: "GET",         
-                url: url, 
+
+              $.ajax({
+                type: "GET",
+                url: url,
                 data: {},
                 dataType: "json",
                 success: function(data) {
@@ -267,7 +260,7 @@
                 }
              });
           // }else{
-            
+
           // }
   })
 
@@ -276,41 +269,36 @@
         title: 'Confirm!',
         content: 'Are You Sure to assign this customer!',
         buttons: {
-              
+
               cancel: function () {
-                
+
               },
               confirm: {
               text: 'Confirm',
               btnClass: 'btn-green',
               keys: ['enter', 'shift'],
               action: function(){
-                  $.ajax({      
-                        type: "POST",         
+                  $.ajax({
+                        type: "POST",
                         url: "update_sale" ,
                         data: {customer_id:customer_id,sale_id:sale_id},
                         dataType: "json",
                         success: function(data) {
                           if(data.status == true)
-                          { 
-                            
+                          {
+
                             window.location.href = '/origami'
                           }else{
                             alert('Record not found!');
                             location.reload();
                           }
-                          
-                        }  
+
+                        }
                 });
                }
               }
-              
-        }
+         }
       });
   }
 
 </script>
-
-
-     
-