diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index dc3ab163..70594497 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -209,13 +209,7 @@ $(document).ready(function(){
 		  			if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
 		  				var balance = data["response_data"]["data"][i]["balance"];
 		  				console.log(balance);
-		  				if (balance == "0.0") {
-		  					$("#customer_amount").text('0.0');
-		  				}else{
 		  					$("#customer_amount").text(balance);
-		  				}
-
-
 		  			}
 		  		});
 		  	}
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index eb8b7c6f..518f4e33 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -5,7 +5,7 @@ class Crm::CustomersController < BaseCrmController
   # GET /crm/customers.json
   def index
     filter = params[:filter]
-
+    
     if filter.nil?
       @crm_customers = Customer.order("customer_id").page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
@@ -31,7 +31,7 @@ class Crm::CustomersController < BaseCrmController
   # GET /crm/customers/1.json
   def show
     @orders = Order.where("customer_id=?", params[:id])
-
+  
     if @orders
       @order_items = []
       @orders.each do |bo|
@@ -57,6 +57,7 @@ class Crm::CustomersController < BaseCrmController
    def create
 
     @crm_customers = Customer.new(customer_params)
+    
     respond_to do |format|
      puts @crm_customers.errors.to_json
       if @crm_customers.save
@@ -72,9 +73,7 @@ class Crm::CustomersController < BaseCrmController
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
-
                                                         dob: dob,
-
                                                         member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
@@ -83,18 +82,18 @@ class Crm::CustomersController < BaseCrmController
                                         )
 
           if response["status"] == true
-
+          
               customer = Customer.find(@crm_customers.customer_id)
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
-
+              
                if params[:sale_id]
                  format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' }
                else
                  format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
-               end
+               end              
               # format.json { render :index, status: :created, location: @crm_customers }
           else
-
+              
               @crm_customers.destroy
               if params[:sale_id]
                 format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
@@ -105,9 +104,9 @@ class Crm::CustomersController < BaseCrmController
       else
 
           if params[:sale_id]
-            format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
+            format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} 
           else
-
+            flash[:errors] = @crm_customers.errors
             format.html { redirect_to crm_customers_path}
             format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
           end
@@ -134,7 +133,7 @@ end
         memberaction    = MembershipAction.find_by_membership_type("update_membership_customer")
         merchant_uid    = memberaction.merchant_account_id.to_s
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-
+        
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         dob: dob,
                                                         id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json,
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 034f06b7..04ba5e32 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -67,6 +67,7 @@
 
   </div>
   <div class="col-lg-4">
+
     <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
 
     <span class="patch_method"></span>
@@ -74,16 +75,26 @@
     
     <div class="form-group">
       <%= f.input :name, :class => "form-control col-md-6 name" %>
+      <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["name"] %></span>
+      <% end -%>
+     
     </div>
     <div class="form-group">
       <%= f.input :company, :class => "form-control col-md-6 company" %>
     </div>
     <div class="form-group">
       <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %>
+      <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["contact_no"] %></span>
+      <% end -%>
     </div>
 
     <div class="form-group">
       <%= f.input :email, :class => "form-control col-md-6 email" %>
+      <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["email"] %></span>
+      <% end -%>
     </div>
 
     <div class="form-group">
@@ -98,7 +109,10 @@
                <option value="<%= member.value %>">
               <%= member.name %></option>
             <%end %>
-          </select>    
+          </select> 
+          <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["member_group_id"] %></span>
+      <% end -%>   
   </div>
   
 
@@ -119,13 +133,13 @@
             var sale_id     = $("#sale_id").val() || 0;
             var customer_id = $(this).val();
 
-            // if(sale_id != 0){
-            //   // var url = "/"+customer_id;
-            //   update_sale(customer_id,sale_id);
-            // }else{
+            if(sale_id != 0){
+              // var url = "/"+customer_id;
+              update_sale(customer_id,sale_id);
+            }else{
               
-            //   var url = "customers/"+customer_id;
-            // }
+              var url = "customers/"+customer_id;
+            }
               
               $.ajax({      
                 type: "GET",         
@@ -161,43 +175,43 @@
           }
   })
 
-  // function update_sale(customer_id,sale_id) {
-  //     $.confirm({
-  //       title: 'Confirm!',
-  //       content: 'Are You Sure to assign this customer!',
-  //       buttons: {
+  function update_sale(customer_id,sale_id) {
+      $.confirm({
+        title: 'Confirm!',
+        content: 'Are You Sure to assign this customer!',
+        buttons: {
               
-  //             cancel: function () {
+              cancel: function () {
                 
-  //             },
-  //             confirm: {
-  //             text: 'Confirm',
-  //             btnClass: 'btn-green',
-  //             keys: ['enter', 'shift'],
-  //             action: function(){
-  //                 $.ajax({      
-  //                       type: "POST",         
-  //                       url: "update_sale/" ,
-  //                       data: {customer_id:customer_id,sale_id:sale_id},
-  //                       dataType: "json",
-  //                       success: function(data) {
-  //                         if(data.status == true)
-  //                         { 
-  //                           alert('Customer has assigned');
-  //                           window.location.href = '/origami'
-  //                         }else{
-  //                           alert('Record not found!');
-  //                           location.reload();
-  //                         }
+              },
+              confirm: {
+              text: 'Confirm',
+              btnClass: 'btn-green',
+              keys: ['enter', 'shift'],
+              action: function(){
+                  $.ajax({      
+                        type: "POST",         
+                        url: "update_sale/" ,
+                        data: {customer_id:customer_id,sale_id:sale_id},
+                        dataType: "json",
+                        success: function(data) {
+                          if(data.status == true)
+                          { 
+                            alert('Customer has assigned');
+                            window.location.href = '/origami'
+                          }else{
+                            alert('Record not found!');
+                            location.reload();
+                          }
                           
-  //                       }  
-  //               });
-  //              }
-  //             }
+                        }  
+                });
+               }
+              }
               
-  //       }
-  //     });
-  // }
+        }
+      });
+  }
 
 </script>
 
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index f7b4a692..80150220 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -78,17 +78,25 @@
     
     <div class="form-group">
       <%= f.input :name, :class => "form-control col-md-6 name" %>
-
+      <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["name"] %></span>
+      <% end -%>
     </div>
     <div class="form-group">
       <%= f.input :company, :class => "form-control col-md-6 company" %>
     </div>
     <div class="form-group">
       <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %>
+      <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["contact_no"] %></span>
+      <% end -%>
     </div>
 
     <div class="form-group">
-      <%= f.input :email, :class => "form-control col-md-6 email" %>      
+      <%= f.input :email, :class => "form-control col-md-6 email" %> 
+          <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["email"] %></span>
+      <% end -%> 
     </div>
 
     <div class="form-group">
@@ -103,7 +111,11 @@
                <option value="<%= member.value %>">
               <%= member.name %></option>
             <%end %>
-          </select>    
+          </select> 
+          <% if flash[:errors] && !flash[:errors].empty? then -%>
+        <span style="color:red"><%= flash[:errors]["member_group_id"] %></span>
+      <% end -%>   
+
   </div>
 
   <div class="form-group">