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

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">