merge with august_spring

2017-08-30 19:16:07 +06:30
parent 3e8ead6a32 883f5f575a
commit 51d8c986f1
41 changed files with 998 additions and 432 deletions
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -195,7 +195,7 @@
      </div>
    </div> -->
    
-    <div class="card" id="backend" onclick="location.href='<%= inventory_inventory_path %>'">
+    <div class="card" id="backend" onclick="location.href='<%= inventory_path %>'">
      <div class="card-content dashboard-nav">Inventory</div>
    </div>
  </div>