fixes basket count

jameshamann · Jun 26, 2017 · e5fdfc4 · e5fdfc4
1 parent 9cc0cc1
commit e5fdfc4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/views/items/_item_row.html.erb b/app/views/items/_item_row.html.erb
@@ -2,7 +2,6 @@
 
 
 <p><b> <%= link_to "#{item.name}", item_path(item) %> </b></p>
-<p> £<%= item.price %></p>
 <p> <%= image_tag item.avatar.url(:medium), class: "responsive-img" %> </p>
 
 <%= form_for order_item, remote: true do |f| %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/js/materialize.min.js"></script>
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
@@ -15,7 +15,7 @@
   <body>
   <nav>
     <div class="nav-wrapper">
-      <a href="#" class="brand-logo center">Webshop</a>
+      <a href="/" class="brand-logo center">Webshop</a>
       <ul id="nav-mobile" class="left hide-on-med-and-down">
         <% if user_signed_in? %>
           <li><%= link_to "Hello #{current_user.first_name}!", edit_user_registration_path %></li>
@@ -27,7 +27,7 @@
       </ul>
   <ul id="nav-mobile" class="right hide-on-med-and-down">
    <li><i class="material-icons">shopping_basket</i></li>
-  <li><%= render 'layouts/cart_text' %></li>
+  <li class="cart-text"><%= render 'layouts/cart_text' %></li>
  </ul>
  </div>
 </nav>

diff --git a/app/views/order_items/destroy.js.erb b/app/views/order_items/destroy.js.erb
@@ -1,2 +1,4 @@
-$(".cart-text").html("<%= escape_javascript(render 'layouts/cart_text') %>")
-$(".shopping-cart").html("<%= escape_javascript(render 'carts/shopping_cart') %>")
+$(document).ready(function(){
+  $(".cart-text").html("<%= escape_javascript(render 'layouts/cart_text') %>")
+  $(".shopping-cart").html("<%= escape_javascript(render 'carts/shopping_cart') %>")
+});
diff --git a/app/views/order_items/update.js.erb b/app/views/order_items/update.js.erb
@@ -1,2 +1,4 @@
-$(".cart-text").html("<%= escape_javascript(render 'layouts/cart_text') %>")
-$(".shopping-cart").html("<%= escape_javascript(render 'carts/shopping_cart') %>")
+$(document).ready(function(){
+  $(".cart-text").html("<%= escape_javascript(render 'layouts/cart_text') %>")
+  $(".shopping-cart").html("<%= escape_javascript(render 'carts/shopping_cart') %>")
+});