11.1

healthkxy · Mar 6, 2012 · 9f30785 · 9f30785
1 parent 316c82e
commit 9f30785
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 26 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -49,6 +49,25 @@
     width: 13em;
     background: #141;
 
+    form, div {
+      display: inline;
+    }  
+
+    input {
+      font-size: small;
+    }
+
+    #cart {
+      font-size: smaller;
+      color:     white;
+
+      table {
+        border-top:    1px dotted #595;
+        border-bottom: 1px dotted #595;
+        margin-bottom: 10px;
+      }
+    }
+
     ul {
       padding: 0;
 

diff --git a/app/assets/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss
@@ -2,7 +2,7 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-.carts {
+.carts, #side #cart {
   .cart_title {
     font: 120% bold;
   }

diff --git a/app/controllers/line_items_controller.rb b/app/controllers/line_items_controller.rb
@@ -48,7 +48,7 @@ def create
 
     respond_to do |format|
       if @line_item.save
-        format.html { redirect_to @line_item.cart }
+        format.html { redirect_to store_url }
         format.json { render json: @line_item, status: :created, location: @line_item }
       else
         format.html { render action: "new" }

diff --git a/app/controllers/store_controller.rb b/app/controllers/store_controller.rb
@@ -1,5 +1,6 @@
 class StoreController < ApplicationController
   def index
       @products = Product.order(:title)
+      @cart = current_cart
   end
 end
diff --git a/app/views/carts/_cart.html.erb b/app/views/carts/_cart.html.erb
@@ -0,0 +1,13 @@
+
+<div class="cart_title">Your Cart</div>
+<table>
+    <%= render(cart.line_items) %>
+    <tr class="total_line">
+        <td colspan="2">Total</td>
+        <td class="total_cell"><%= number_to_currency(cart.total_price) %></td>
+    </tr>
+
+</table>
+
+<%= button_to 'Empty cart', cart, method: :delete,
+    confirm: 'Are you sure?' %>
diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb
@@ -2,27 +2,4 @@
 <p id="notice"><%= notice %></p>
 <% end %>
 
-<div class="cart_title">Your Cart</div>
-<table>
-    <% @cart.line_items.each do |item| %>
-        <tr>
-            <td><%= item.quantity %>&times;</td>
-            <td><%= item.product.title %></td>
-            <td class="item_price"><%= number_to_currency(item.total_price) %></td>
-        </tr>
-    <% end %>
-
-    <tr class="total_line">
-        <td colspan="2">Total</td>
-        <td class="total_cell"><%= number_to_currency(@cart.total_price) %></td>
-    </tr>
-
-</table>
-
-<%= button_to 'Empty cart', @cart, method: :delete,
-    confirm: 'Are you sure?' %>
-
-<!--
-<%= link_to 'Edit', edit_cart_path(@cart) %> |
-<%= link_to 'Back', carts_path %>
--->
+<%= render @cart %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,6 +13,10 @@
         </div>
         <div id="columns">
             <div id="side">
+                <div id="cart">
+                    <%= render @cart %>
+                </div>
+
                 <ul>
                     <li><a href="http://www....">Home</a></li>
                     <li><a href="http://www..../faq">Questions</a></li>

diff --git a/app/views/line_items/_line_item.html.erb b/app/views/line_items/_line_item.html.erb
@@ -0,0 +1,5 @@
+<tr>
+  <td><%= line_item.quantity %>&times;</td>
+  <td><%= line_item.product.title %></td>
+  <td class="item_price"><%= number_to_currency(line_item.total_price) %></td>
+</tr>