merge with origin

2017-10-27 17:06:07 +06:30
parent 0f24cc0999
commit 5c27dcff66
15 changed files with 135 additions and 250 deletions
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -14,7 +14,7 @@
 <div class="row">
  <div class="col-lg-8 col-md-8 col-sm-8">

-    <div class="main-box-body clearfix" style="min-height:500px; max-height:500px; overflow-x:scroll">
+    <div class="main-box-body clearfix" id="order-detail-slimscroll" style="">
      <div class="table-responsive">
        <table id="origami-crm-table" class="table table-striped">