From ee54f1cdd33f637c38d1a044affad564774f7514 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Jun 2017 12:04:55 +0630
Subject: [PATCH] validate error

---
 app/controllers/crm/customers_controller.rb    | 11 +++++++----
 .../origami/customers_controller.rb            | 10 ++++------
 app/views/crm/customers/index.html.erb         | 16 ++++------------
 app/views/layouts/CRM.html.erb                 |  5 ++++-
 app/views/layouts/origami.html.erb             | 11 +++++++----
 app/views/origami/customers/index.html.erb     | 18 +++---------------
 6 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 518f4e33..ae6820df 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -14,9 +14,9 @@ class Crm::CustomersController < BaseCrmController
     #@crm_customers  = Customer.all
      @crm_customer   = Customer.new
 
-
-    # puts @crm_customer.valid?
-   
+    if flash["errors"]
+      @crm_customer.valid?
+    end
     # @membership     = Customer.get_member_group
     # if @membership["status"] == true
     #   @member_group = @membership["data"]
@@ -104,7 +104,9 @@ class Crm::CustomersController < BaseCrmController
       else
 
           if params[:sale_id]
+            flash[:errors] = @crm_customers.errors
             format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} 
+            format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
           else
             flash[:errors] = @crm_customers.errors
             format.html { redirect_to crm_customers_path}
@@ -148,7 +150,8 @@ end
 
       else
 
-        format.html { render :index }
+        flash[:errors] = @crm_customers.errors
+        format.html { redirect_to crm_customers_path}
         format.json { render json: @crm_customer.errors, status: :unprocessable_entity }
       end
 
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 14af5f49..7d0b5502 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -24,12 +24,10 @@ class Origami::CustomersController < BaseOrigamiController
     end
     # @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2)
     @crm_customer    = Customer.new
-    # @membership     = Customer.get_member_group
-    #  if @membership["status"] == true
-    #    @member_group = @membership["data"]
-    #  end
-    # puts "Errrrrrrrrrrrrrrrrr"
-    # puts  @crm_customer.valid?
+    
+    if flash["errors"]
+      @crm_customer.valid?
+    end
   
    
     respond_to do |format|
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 04ba5e32..ba36500c 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -75,9 +75,7 @@
     
     <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">
@@ -85,16 +83,12 @@
     </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">
@@ -110,9 +104,7 @@
               <%= member.name %></option>
             <%end %>
           </select> 
-          <% if flash[:errors] && !flash[:errors].empty? then -%>
-        <span style="color:red"><%= flash[:errors]["member_group_id"] %></span>
-      <% end -%>   
+           
   </div>
   
 
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb
index fb851d68..42b559e2 100644
--- a/app/views/layouts/CRM.html.erb
+++ b/app/views/layouts/CRM.html.erb
@@ -19,7 +19,10 @@
       <% flash.each do |type, message| %>
 						  <div class="alert-danger fade in">
 						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
-						    <%= message %>
+
+						    <% if !flash["errors"]%>
+                  <%=message%>
+                <% end %>
 						  </div>
 			<% end %>
       <%= yield %>
diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb
index ef5f3789..179d9ae1 100644
--- a/app/views/layouts/origami.html.erb
+++ b/app/views/layouts/origami.html.erb
@@ -17,10 +17,13 @@
     <%= render 'layouts/header_orgiami' %>
     <div class="container-fluid">
       <% flash.each do |type, message| %>
-						  <div class="alert fade in">
-						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
-						    <%= message %>
-						  </div>
+						    <% if !flash["errors"]%>
+                <div class="alert fade in">
+                <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
+                  <%=message%>
+                 </div>
+                <% end %>
+						 
 			<% end %>
       <%= yield %>
 
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 80150220..f7b4a692 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -78,25 +78,17 @@
     
     <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 -%> 
+      <%= f.input :email, :class => "form-control col-md-6 email" %>      
     </div>
 
     <div class="form-group">
@@ -111,11 +103,7 @@
                <option value="<%= member.value %>">
               <%= member.name %></option>
             <%end %>
-          </select> 
-          <% if flash[:errors] && !flash[:errors].empty? then -%>
-        <span style="color:red"><%= flash[:errors]["member_group_id"] %></span>
-      <% end -%>   
-
+          </select>    
   </div>
 
   <div class="form-group">