merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -101,6 +101,12 @@
    </div>
    <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll">
    <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
+
+    <div class="col-lg-1 col-md-1 col-sm-1">
+    <br>
+       <a href="<%= dashboard_path%>" class="btn btn-primary">
+       Back
+       </a>
    </div>
    <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
      <br>