piggybak 0.6.24 → 0.6.25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.24)
+    piggybak (0.6.25)
       activemerchant
       countries
       devise

data/README.md

@@ -44,14 +44,9 @@ Installation
 
 (NOTE: If you run into an error saying that piggybak gem is missing, use bundle exec piggybak install)
 
-* Piggybak is now installed and ready to be added to whatever model class will be sold.
-
-        class Product < ActiveRecord::Base
-          acts_as_sellable
-        end
-
-* Piggybak checkout is located at /checkout
+* Follow the instructions [here][documentation] to read more about the integration points and product configuration in Piggybak.
 
+[documentation]: http://www.piggybak.org/documentation.html#integration
 
 More Details
 ========
@@ -63,11 +58,9 @@ Visit the project website [here][project-website] to see more documentation and
 TODO
 ========
 
-* Fix tax calculation when coupon / discounts applied.
-
 * Ensure that changes in nested addresses are recorded on order notes.
 
 Copyright
 ========
 
-Copyright (c) 2011 End Point & Steph Skardal. See LICENSE.txt for further details.
+Copyright (c) 2013 End Point & Steph Skardal. See LICENSE.txt for further details.

data/app/controllers/piggybak/orders_controller.rb

@@ -26,7 +26,7 @@ module Piggybak
               end
               logger.info "#{request.remote_ip}:#{Time.now.strftime("%Y-%m-%d %H:%M")} Order received with params #{clean_params.inspect}" 
             end
-            @order.initialize_user(current_user, true)
+            @order.initialize_user(current_user)
 
             @order.ip_address = request.remote_ip 
             @order.user_agent = request.user_agent  
@@ -62,7 +62,7 @@ module Piggybak
       else
         @order = Piggybak::Order.new
         @order.create_payment_shipment
-        @order.initialize_user(current_user, false)
+        @order.initialize_user(current_user)
       end
     end
   

data/app/helpers/piggybak_helper.rb

@@ -1,9 +1,9 @@
 module PiggybakHelper
-  def cart_form(object)
-    render "piggybak/cart/form", :object => object
+  def cart_form(object, options = {})
+    render "piggybak/cart/form", :object => object, :locals => { :options => options }
   end
   def cart_link
-    cart = Piggybak::Cart.new(request.cookies["cart"]) 
+    cart = Piggybak::Cart.new(request.cookies["cart"])
     nitems = cart.sellables.inject(0) { |nitems, item| nitems + item[:quantity] }
     if nitems > 0 && !["piggybak/orders", "piggybak/cart"].include?(params[:controller])
       link_to "#{pluralize(nitems, 'item')}: #{number_to_currency(cart.total)}", piggybak.cart_url

data/app/models/piggybak/order.rb

@@ -60,7 +60,7 @@ module Piggybak
       end
     end
 
-    def initialize_user(user, on_post)
+    def initialize_user(user)
       if user
         self.user = user
         self.email = user.email 

data/app/views/piggybak/cart/_form.html.erb

@@ -1,7 +1,7 @@
 <% if object.reflections.keys.include?(:piggybak_sellable) -%>
 	<% if object.piggybak_sellable && object.piggybak_sellable.active -%>
 		<% if object.piggybak_sellable.quantity > 0 || object.piggybak_sellable.unlimited_inventory -%>
-			<%= form_tag piggybak.cart_add_url do -%>
+			<%= form_tag piggybak.cart_add_url, locals[:options] do -%>
 			<div id="sellable_details">
 			<span id="title"><%= object.piggybak_sellable.description %></span>
 			<span id="price"><%= number_to_currency object.piggybak_sellable.price %></span>

data/db/migrate/20121210211600_change_user_agent_type.rb

@@ -0,0 +1,9 @@
+class ChangeUserAgentType < ActiveRecord::Migration
+  def up
+    change_column :orders, :user_agent, :text
+  end
+
+  def down
+    change_column :orders, :user_agent, :string
+  end
+end

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.24"
+  VERSION = "0.6.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.24
+  version: 0.6.25
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - db/migrate/20111228231806_create_payment_methods.rb
 - db/migrate/20121018213421_drop_sort_from_line_items.rb
 - db/migrate/20121022164235_convert_all_decimal_fields.rb
+- db/migrate/20121210211600_change_user_agent_type.rb
 - db/migrate/20111228231838_create_shipments.rb
 - db/migrate/20120104020930_populate_countries_and_states.rb
 - db/migrate/20111227213558_create_variants.rb
@@ -234,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2460413229810788537
+      hash: 1469996782340380432
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2460413229810788537
+      hash: 1469996782340380432
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23