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

change UI for Customer

Browse Source
This commit is contained in:
phyusin
2017-11-22 18:35:44 +06:30
parent 5ff93ad20d
commit 50de7dd377
2 changed files with 220 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/views/crm/customers/_new_form.html.erb
View File

@@ -1,9 +1,9 @@
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
<span class="patch_method"></span> <span class="patch_method"></span>
<%= f.hidden_field :id, :class => "form-control " %> <%= f.hidden_field :id, :class => "form-control " %>
<div class="form-group"> <div class="form-group">
<label> <%= t("views.right_panel.detail.salutation") %> :</label><br> <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
<label class="font-13"><%= t("views.right_panel.detail.mr") %> <label class="font-13"><%= t("views.right_panel.detail.mr") %>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
@@ -18,9 +18,9 @@
<%= t("views.right_panel.detail.mdm") %> <%= t("views.right_panel.detail.mdm") %>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
</label> </label>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :name, :class => "form-control col-md-6 name", :required => true %> <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
<% flash.each do |test, msg| %> <% flash.each do |test, msg| %>
<% <%
@@ -29,21 +29,21 @@
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end -%> <% end -%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><%= t("views.right_panel.detail.gender") %> :</label><br> <label><%= t("views.right_panel.detail.gender") %> :</label><br>
<label><%= t("views.right_panel.detail.male") %></label> <label><%= t("views.right_panel.detail.male") %>
<%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%> <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%></label>
<label><%= t("views.right_panel.detail.female") %></label> <label><%= t("views.right_panel.detail.female") %>
<%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%> <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %> <%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %>
</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"%>
<% flash.each do |name, msg| %> <% flash.each do |name, msg| %>
@@ -52,8 +52,8 @@
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end -%> <% end -%>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%> <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
<% flash.each do |name, msg| %> <% flash.each do |name, msg| %>
@@ -62,9 +62,9 @@
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end %> <% end %>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%> <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
<% flash.each do |name, msg| %> <% flash.each do |name, msg| %>
@@ -73,26 +73,25 @@
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end %> <% end %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :address, :class => "form-control col-md-6 address" %> <%= f.input :address, :class => "form-control col-md-6 address" %>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><%= t("views.right_panel.detail.sr_no") %></label> <label><%= t("views.right_panel.detail.sr_no") %></label>
<div class="form-line disabled"> <div class="form-line disabled">
<input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" > <input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
</div> </div>
</div>
</div> <div class="form-group">
<div class="form-group">
<label><%= t("views.right_panel.detail.date_of_birth") %></label> <label><%= t("views.right_panel.detail.date_of_birth") %></label>
<%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> <%= f.text_field :date_of_birth, :value=>"01-01-1990",:class=>"datepicker form-control col-md-12"%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><%= t("views.right_panel.detail.select_customer_type") %></label> <label><%= t("views.right_panel.detail.select_customer_type") %></label>
<select class="form-control col-md-12 selectpicker show-tick" id="customer_type" name="customer[customer_type]" style="height: " > <select class="form-control col-md-12 selectpicker show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
<% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %> <% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
@@ -100,13 +99,13 @@
<%= ct.name %></option> <%= ct.name %></option>
<%end %> <%end %>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :card_no, :class => "form-control col-md-6 card_no"%> <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
<% flash.each do |name, msg| %> <% flash.each do |name, msg| %>
<% str="[\"#{msg['card_no']}\"]" <% str="[\"#{msg['card_no']}\"]"
@@ -114,17 +113,17 @@
str.gsub!('"]', '') %> str.gsub!('"]', '') %>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable> <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end %> <% end %>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><%= t("views.right_panel.detail.paypar_account_no") %>:</label> <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
<div class="-group"> <div class="-group">
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/> <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
<div class="input-group-addon"><span class="fa fa-credit-card"></span></div> <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><%= t("views.right_panel.detail.select_membership_group") %></label> <label><%= t("views.right_panel.detail.select_membership_group") %></label>
<select class="form-control col-md-12 selectpicker show-tick" name="member_group_id" style="height: " > <select class="form-control col-md-12 selectpicker show-tick" name="member_group_id" style="height: " >
<option value=""><%= t("views.right_panel.detail.select_membership_group") %></option> <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
@@ -134,16 +133,16 @@
<%end %> <%end %>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> <!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
<%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> --> <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
<button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button> <button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
<button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button> <button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
<button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button> <button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
</div> </div>
<%end%> <%end%>
<div id="sxModal"> <div id="sxModal">
@@ -166,7 +165,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
// Read Card Reader // Read Card Reader
$("#paypar_account_no").on('focus', function(e){ $("#paypar_account_no").on('focus', function(e){
if($(this).val() == ''){ if($(this).val() == ''){
$("#sxModal").show(); $("#sxModal").show();

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

@@ -12,6 +12,8 @@
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-9 col-md-9 col-sm-9"> <div class="col-lg-9 col-md-9 col-sm-9">
<div class="card">
<div class="body">
<!-- <div class="main-box-body clearfix"> --> <!-- <div class="main-box-body clearfix"> -->
<div class="body table-responsive"> <div class="body table-responsive">
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">
@@ -83,10 +85,19 @@
</div> </div>
<!-- </div> --> <!-- </div> -->
</div> </div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<div id="custom-slimscroll"> <div class="row">
<div class="col-md-12">
<div class="card">
<div class="body" id="custom-slimscroll">
<%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %> <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
</div> </div>
</div>
</div>
</div>
<!-- <div class="col-lg-1 col-md-1 col-sm-1 "> <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
<br> <br>
<a href="<%= dashboard_path%>" class="btn btn-primary"> <a href="<%= dashboard_path%>" class="btn btn-primary">