git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validate error

Browse Source
This commit is contained in:
Aung Myo
2017-06-13 12:04:55 +06:30
parent 9e4c8cef68
commit ee54f1cdd3
6 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/crm/customers_controller.rb
View File

@@ -14,9 +14,9 @@ class Crm::CustomersController < BaseCrmController
#@crm_customers = Customer.all #@crm_customers = Customer.all
@crm_customer = Customer.new @crm_customer = Customer.new
if flash["errors"]
# puts @crm_customer.valid? @crm_customer.valid?
end
# @membership = Customer.get_member_group # @membership = Customer.get_member_group
# if @membership["status"] == true # if @membership["status"] == true
# @member_group = @membership["data"] # @member_group = @membership["data"]
@@ -104,7 +104,9 @@ class Crm::CustomersController < BaseCrmController
else else
if params[:sale_id] if params[:sale_id]
flash[:errors] = @crm_customers.errors
format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
else else
flash[:errors] = @crm_customers.errors flash[:errors] = @crm_customers.errors
format.html { redirect_to crm_customers_path} format.html { redirect_to crm_customers_path}
@@ -148,7 +150,8 @@ end
else 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 } format.json { render json: @crm_customer.errors, status: :unprocessable_entity }
end end

10
app/controllers/origami/customers_controller.rb
View File

@@ -24,12 +24,10 @@ class Origami::CustomersController < BaseOrigamiController
end end
# @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2) # @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2)
@crm_customer = Customer.new @crm_customer = Customer.new
# @membership = Customer.get_member_group
# if @membership["status"] == true if flash["errors"]
# @member_group = @membership["data"] @crm_customer.valid?
# end end
# puts "Errrrrrrrrrrrrrrrrr"
# puts @crm_customer.valid?
respond_to do |format| respond_to do |format|

16
app/views/crm/customers/index.html.erb
View File

@@ -75,9 +75,7 @@
<div class="form-group"> <div class="form-group">
<%= f.input :name, :class => "form-control col-md-6 name" %> <%= 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>
<div class="form-group"> <div class="form-group">
@@ -85,16 +83,12 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> <%= 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>
<div class="form-group"> <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>
<div class="form-group"> <div class="form-group">
@@ -110,9 +104,7 @@
<%= member.name %></option> <%= member.name %></option>
<%end %> <%end %>
</select> </select>
<% if flash[:errors] && !flash[:errors].empty? then -%>
<span style="color:red"><%= flash[:errors]["member_group_id"] %></span>
<% end -%>
</div> </div>

5
app/views/layouts/CRM.html.erb
View File

@@ -19,7 +19,10 @@
<% flash.each do |type, message| %> <% flash.each do |type, message| %>
<div class="alert-danger fade in"> <div class="alert-danger fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button> <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%= message %>
<% if !flash["errors"]%>
<%=message%>
<% end %>
</div> </div>
<% end %> <% end %>
<%= yield %> <%= yield %>

11
app/views/layouts/origami.html.erb
View File

@@ -17,10 +17,13 @@
<%= render 'layouts/header_orgiami' %> <%= render 'layouts/header_orgiami' %>
<div class="container-fluid"> <div class="container-fluid">
<% flash.each do |type, message| %> <% flash.each do |type, message| %>
<div class="alert fade in"> <% if !flash["errors"]%>
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button> <div class="alert fade in">
<%= message %> <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
</div> <%=message%>
</div>
<% end %>
<% end %> <% end %>
<%= yield %> <%= yield %>

14
app/views/origami/customers/index.html.erb
View File

@@ -78,25 +78,17 @@
<div class="form-group"> <div class="form-group">
<%= f.input :name, :class => "form-control col-md-6 name" %> <%= 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>
<div class="form-group"> <div class="form-group">
<%= f.input :company, :class => "form-control col-md-6 company" %> <%= f.input :company, :class => "form-control col-md-6 company" %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> <%= 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>
<div class="form-group"> <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>
<div class="form-group"> <div class="form-group">
@@ -112,10 +104,6 @@
<%= member.name %></option> <%= member.name %></option>
<%end %> <%end %>
</select> </select>
<% if flash[:errors] && !flash[:errors].empty? then -%>
<span style="color:red"><%= flash[:errors]["member_group_id"] %></span>
<% end -%>
</div> </div>
<div class="form-group"> <div class="form-group">