spree_ajax_cart 1.0.1 → 1.2.0

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_ajax_cart', '~> 1.0.1'
+  gem 'spree_ajax_cart', '~> 1.2.0'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

data/app/controllers/spree/orders_controller_decorator.rb

@@ -3,7 +3,7 @@ Spree::OrdersController.class_eval do
   respond_override :populate => { :js => { :success => lambda { render "populate" ,:object => @order } } }
 
   def ajax_cart
-    render :partial => 'orders/ajax_cart'
+    render :partial => 'spree/orders/ajax_cart'
   end
 
 end

data/app/helpers/spree/{orders_helper_decorator.rb → base_helper_decorator.rb}

@@ -1,4 +1,4 @@
-Spree::OrdersHelper.module_eval do
+Spree::BaseHelper.module_eval do
   
   def cart_item_count
     return "" if current_page?(cart_path)

data/app/views/spree/orders/_ajax_cart.html.erb

@@ -1,7 +1,7 @@
 <div id="cart">
 	<h3 id="cart-title" style="width: 660px;"><%= t(:shopping_cart) %></h3>
 
-	<% if current_order.empty? && current_order.line_items.empty? %>
+	<% if !current_order && current_order.empty? && current_order.line_items.empty? %>
 	<div data-hook="empty_cart">
 		<p><%= t(:your_cart_is_empty) %></p>
 		<p><%= link_to t(:continue_shopping), products_path, :class => 'button continue' %></p>
@@ -12,8 +12,8 @@
 
 		<div data-hook="inside_cart_form">
 			<div data-hook="cart_items">
-				<% current_order.line_items.each do |order_form| %>
-				<% variant = order_form.variant %>
+				<% current_order.line_items.each do |line_item| %>
+				<% variant = line_item.variant %>
 				<table id="cart-detail" data-hook>
 					<thead>
 						<tr data-hook="cart_items_headers">
@@ -41,13 +41,13 @@
 								<%= truncate(strip_tags(variant.product.description), :length => 30, :omission => "...") %>
 							</td>
 							<td data-hook="cart_item_price">
-								<%= product_price(order_form.variant) %>
+								<%= money(line_item.price) %>
 							</td>
 							<td data-hook="cart_item_quantity">
-								<%= order_form.quantity %>
+								<%= line_item.quantity %>
 							</td>
 							<td data-hook="cart_item_total">
-								<%= format_price(product_price(order_form.variant, :format_as_currency => false) * order_form.quantity) unless order_form.quantity.nil?%>
+								<%= money(line_item.price * line_item.quantity) unless line_item.quantity.nil?%>
 							</td>
 						</tr>
 					</tbody>
@@ -56,7 +56,7 @@
 			</div>
 
 			<div id="subtotal" data-hook>
-				<h3><%= "#{t(:subtotal)}: #{order_price(current_order)}" %></h3>
+				<h3><%= "#{t(:subtotal)}: #{money(current_order.item_total)}" if current_order %></h3>
 				<div class="links" data-hook="cart_buttons">
 					<%= link_to "Procedi al carrello" , cart_path, :class => 'button checkout primary', :id => 'checkout-link' %>
 				</div>

data/config/routes.rb

@@ -1,3 +1,3 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.draw do
   match '/ajax_cart', :to => 'orders#ajax_cart', :via => :get, :as => :ajax_cart
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_ajax_cart
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -64,7 +64,7 @@ files:
 - app/assets/stylesheets/store/qtip-ajax_cart.css
 - app/assets/stylesheets/store/spree_ajax_cart.css
 - app/controllers/spree/orders_controller_decorator.rb
-- app/helpers/spree/orders_helper_decorator.rb
+- app/helpers/spree/base_helper_decorator.rb
 - app/views/spree/orders/_ajax_cart.html.erb
 - app/views/spree/orders/populate.js.erb
 - config/locales/en.yml