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

merge with origin

Browse Source
This commit is contained in:
Yan
2017-10-12 10:23:51 +06:30
parent de1469bd5e 9365e64066
commit 59b47518a1
16 changed files with 342 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@
<div class="form-group">
<label>Select Customer Type</label>
<select class="form-control col-md-12" 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| %>
<option value="<%= ct.value %>">
<%= ct.name %></option>
@@ -121,13 +121,14 @@
<div class="form-group">
<label>Select Member Group</label>
<select class="form-control col-md-12" name="member_group_id" style="height: " >
<select class="form-control col-md-12 selectpicker show-tick" name="member_group_id" style="height: " >
<option value="">Select Membership Group</option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
<option value="<%= member.value %>">
<%= member.name %></option>
<%end %>
</select>
</select>
</div>
<div class="form-group">

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

@@ -36,10 +36,10 @@
<div class="row clearfix">
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
<div class="form-group">
<div class="form-line">
<!-- <div class="form-line"> -->
<input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control">
<input type="hidden" name="type" id="type" value="">
</div>
<!-- </div> -->
</div>
</div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
@@ -99,7 +99,8 @@
</div>
<!-- </div> -->
</div>
<div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll">
<div class="col-lg-4 col-md-4 col-sm-4">
<div id="custom-slimscroll">
<%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
<div class="col-lg-1 col-md-1 col-sm-1">
@@ -108,6 +109,7 @@
Back
</a>
</div>
</div>
<!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
<br>
<a href="<%= dashboard_path%>" class="btn btn-primary">

17
app/views/crm/customers/show.html.erb
View File

@@ -1,17 +1,18 @@
<div class="row">
<div class="col-lg-11 col-md-11 col-sm-11">
<!-- Column One -->
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#customer" role="tab">Customer Details</a>
<ul class="nav nav-tabs tab-col-purple" role="tablist">
<li role="presentation" class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#customer" aria-expanded="true">Customer Details</a>
</li>
<li class="nav-item">
<a class="nav-link " data-toggle="tab" href="#order" role="tab">Order Details</a>
<li class="nav-item" role="presentation">
<a class="nav-link " data-toggle="tab" href="#order" aria-expanded="true">Order Details</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#sale" role="tab">Sale Details</a>
<li class="nav-item" role="presentation">
<a class="nav-link" data-toggle="tab" href="#sale" aria-expanded="true">Sale Details</a>
</li>
</ul>
<!-- Nav tabs - End -->