refinerycms-stores 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    refinerycms-stores (0.0.4)
+    refinerycms-stores (0.0.5)
       aasm (> 3.0)
       haml-rails
       hpricot

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/controllers/refinery/products/products_controller.rb

@@ -1,6 +1,7 @@
 module Refinery
   module Products
-    class ProductsController < ::ApplicationController
+    class ProductsController <  ::Refinery::StoresApplicationController
+      before_filter :find_cart
 
       def show
         @product = Product.find(params[:id])

data/app/controllers/refinery/stores/stores_controller.rb

@@ -1,6 +1,6 @@
 module Refinery
   module Stores
-    class StoresController < ::ApplicationController
+    class StoresController < ::Refinery::StoresApplicationController
 
       before_filter :find_all_stores, :only => :index
       before_filter :find_page, :except => [:index, :add_to_cart, :empty_cart, :checkout]
@@ -55,11 +55,7 @@ module Refinery
     redirect_to refinery.stores_store_path( find_first_store )
   end
     
-  
-  def find_cart
-    @cart = (session[:cart] ||= Cart.new)
-  end
-  
+ 
     protected
 
       def find_first_store

data/app/controllers/refinery/stores_application_controller.rb

@@ -0,0 +1,12 @@
+module Refinery
+    class StoresApplicationController < ::ApplicationController
+    
+
+protected
+  
+  def find_cart
+    @cart = (session[:cart] ||= Cart.new)
+  end
+ 
+    end  # class
+end  # mod

data/app/views/refinery/products/products/show.html.erb

@@ -3,103 +3,74 @@
 <% end %>
 
 <% content_for :body_content_left do %>
-  <section>
-    <h1>Store</h1>
-    <p>
-      <%=raw @product.store %>
-    </p>
-  </section>
-  <section>
-    <h1>Name</h1>
-    <p>
-      <%=raw @product.name %>
-    </p>
-  </section>
-  <section>
-    <h1>Code</h1>
-    <p>
-      <%=raw @product.code %>
-    </p>
-  </section>
-  <section>
-    <h1>Description</h1>
-    <p>
-      <%=raw @product.description %>
-    </p>
-  </section>
-  <section>
-    <h1>Date Available</h1>
-    <p>
-      <%=raw @product.date_available %>
-    </p>
-  </section>
-  <section>
-    <h1>Price</h1>
-    <p>
-      <%=raw @product.price %>
-    </p>
-  </section>
-  <section>
-    <h1>Size Width</h1>
-    <p>
-      <%=raw @product.size_width %>
-    </p>
-  </section>
-  <section>
-    <h1>Size Height</h1>
-    <p>
-      <%=raw @product.size_height %>
-    </p>
-  </section>
-  <section>
-    <h1>Size Depth</h1>
-    <p>
-      <%=raw @product.size_depth %>
-    </p>
-  </section>
-  <section>
-    <h1>Weight</h1>
-    <p>
-      <%=raw @product.weight %>
-    </p>
-  </section>
-  <section>
-    <h1>Tax Type</h1>
-    <p>
-      <%=raw @product.tax_type %>
-    </p>
-  </section>
-  <section>
-    <h1>Digital Download</h1>
-    <p>
-      <%=raw @product.digital_download %>
-    </p>
-  </section>
-  <section>
-    <h1>Main Pic</h1>
-    <p>
-      <%=raw @product.main_pic %>
-    </p>
-  </section>
-  <section>
-    <h1>Inactive</h1>
-    <p>
-      <%=raw @product.inactive %>
-    </p>
+  <section id="product">
+
+   <div class="product_show">
+
+     <div class="product_photo">
+
+       <% if @product.main_pic_id -%>
+          <%= image_fu @product.main_pic, Refinery::Images.user_image_sizes[:large], :class => "product-pic", :alt =>  @product.name  %>
+       <% else -%>
+         &nbsp;
+       <% end %>
+
+     </div>
+
+     <div class="product_text">
+
+       <h2> <%= @product.name %> </h2>
+        <p>
+          <%= raw @product.description %>
+        </p>
+
+     </div>
+
+   </div>
+
+   <div class="product_spec">
+
+     <div class="product_code">
+
+        <p>
+          code: <%= @product.code %> <br/>
+          size: 
+          <%= number_with_precision(@product.size_width, :precision => 1) %> x
+          <%= number_with_precision(@product.size_height, :precision => 1) %> x
+          <%= number_with_precision(@product.size_depth, :precision => 1) %> <br/>
+          weight: 
+          <%= number_with_precision(@product.weight, :precision => 1) %> lbs
+
+          <% unless @product.digital_download_id.blank? %>
+            <i>digital download</i>
+          <% end -%>
+        </p>
+
+     </div>
+
+     <div class="product_pricebuy">
+
+        <p>
+          <%= number_to_currency(@product.price) %>
+        </p>
+
+        <div class="product-action">
+         <%= button_to( "add to cart", refinery.add_to_cart_stores_stores_path(:id => @product), :class => "add-to-cart" ) %>
+        </div>
+
+     </div>
+
+   </div>
+
   </section>
+
 <% end %>
 
 <% content_for :body_content_right do %>
   <aside>
-    <h2><%= t('.other') %></h2>
-    <ul id="products">
-      <% @products.each do |product| %>
-        <li>
-          <%= link_to product.name, refinery.products_product_path(product) %>
-        </li>
-      <% end %>
-    </ul>
+      <%= render( :partial => "refinery/stores/stores/cart", :object => @cart ) %>
   </aside>
+
 <% end %>
 
 <%= render '/refinery/content_page' %>

data/app/views/refinery/stores/stores/_cart.html.erb

@@ -8,7 +8,7 @@
   </div>
 
   <table>
-    <%= render(:partial => "cart_item", :collection => cart.items) %>
+    <%= render(:partial => "refinery/stores/stores/cart_item", :collection => cart.items) %>
     <tr class="total-line">
       <td colspan="2">Total</td>
       <td class="total-cell"><%= number_to_currency(cart.total_price) %></td>

data/app/views/refinery/stores/stores/_list_product.html.erb

@@ -9,7 +9,7 @@
    <dd>
    <%= link_to( ( truncate( list_product.name, :length => 60 ) + " &raquo;" ).html_safe, refinery.products_product_path( list_product ) ) %>
    <br/>
-   $<%= number_with_precision(list_product.price, :precision => 2) %>
+   <%= number_to_currency(list_product.price) %>
    <% # = button_to( "add to cart", refinery.add_to_cart_stores_stores_path(:id => list_product), :class => "add-to-cart" ) %>
   
    </dd>

data/refinerycms-stores.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "refinerycms-stores"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daudi Amani"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "app/controllers/refinery/products/products_controller.rb",
     "app/controllers/refinery/stores/admin/stores_controller.rb",
     "app/controllers/refinery/stores/stores_controller.rb",
+    "app/controllers/refinery/stores_application_controller.rb",
     "app/helpers/refinery/orders/orders_helper.rb",
     "app/models/refinery/addresses/address.rb",
     "app/models/refinery/orders/line_item.rb",
@@ -222,6 +223,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rb-inotify>, [">= 0.5.1"])
       s.add_development_dependency(%q<libnotify>, ["~> 0.1.3"])
       s.add_development_dependency(%q<therubyracer>, [">= 0"])
+      s.add_development_dependency(%q<refinerycms-testing>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
+      s.add_development_dependency(%q<generator_spec>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<rb-inotify>, [">= 0.5.1"])
+      s.add_development_dependency(%q<libnotify>, ["~> 0.1.3"])
+      s.add_development_dependency(%q<therubyracer>, [">= 0"])
     else
       s.add_dependency(%q<refinerycms-stores>, [">= 0"])
       s.add_dependency(%q<refinerycms>, ["~> 2.0.0"])
@@ -303,6 +312,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rb-inotify>, [">= 0.5.1"])
       s.add_dependency(%q<libnotify>, ["~> 0.1.3"])
       s.add_dependency(%q<therubyracer>, [">= 0"])
+      s.add_dependency(%q<refinerycms-testing>, ["~> 2.0.0"])
+      s.add_dependency(%q<factory_girl_rails>, [">= 0"])
+      s.add_dependency(%q<generator_spec>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<rb-inotify>, [">= 0.5.1"])
+      s.add_dependency(%q<libnotify>, ["~> 0.1.3"])
+      s.add_dependency(%q<therubyracer>, [">= 0"])
     end
   else
     s.add_dependency(%q<refinerycms-stores>, [">= 0"])
@@ -385,6 +402,14 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rb-inotify>, [">= 0.5.1"])
     s.add_dependency(%q<libnotify>, ["~> 0.1.3"])
     s.add_dependency(%q<therubyracer>, [">= 0"])
+    s.add_dependency(%q<refinerycms-testing>, ["~> 2.0.0"])
+    s.add_dependency(%q<factory_girl_rails>, [">= 0"])
+    s.add_dependency(%q<generator_spec>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<rb-inotify>, [">= 0.5.1"])
+    s.add_dependency(%q<libnotify>, ["~> 0.1.3"])
+    s.add_dependency(%q<therubyracer>, [">= 0"])
   end
 end