piggybak 0.3.0 → 0.3.1

data/README.md

@@ -11,28 +11,6 @@ Modular / mountable ecommerce gem. Features:
 
 * Fully defined backend RailsAdmin interface for adding orders on the backend
 
-This engine explicitly excludes:
-
-* SSL configuration (to be handled in your parent application)
-
-* Redirects on login / logout (see recipe below)
-
-* Coupons and Gift cerficates (May be added later)
-
-* Per unit inventory tracking
-
-* Downloadable products
-
-This engine is highly dependent on: 
-
-* Rails 3.1 (Assets, Engines)
-
-* RailsAdmin (Admin UI) 
-
-* Devise (User Authentication)
-
-* CanCan (User Authorization)
-
 Installation
 ========
 
@@ -52,62 +30,14 @@ Installation
 
         mount Piggybak::Engine => '/checkout', :as => 'piggybak'" to config/routes
 
-Integration Components
+More Details
 ========
 
-* Add acts_as_variant to models that will be sellable
-* Add acts_as_orderer to user model (or model that devise hooks into as authenticated user)
-* Add <%= cart_form(@some_item) %> to view to display cart form
-* Add <%= cart_link %> to display link to cart
-* Add <%= orders_link %> to display link to user orders
-
-Recipes
-========
-
-* Redirect after login / logout
-
-        before_filter :set_last_page
-        def set_last_page
-            if !request.xhr? && !request.url.match(/users\/sign_in/) && !request.url.match(/users\/sign_out/)
-            session[:return_to] = request.url
-            end 
-        end 
-        def after_sign_in_path_for(resource_or_scope)
-            session[:return_to] || root_url
-        end 
-        def after_sign_out_path_for(resource_or_scope)
-            session[:return_to] || root_url
-        end
-
-* Cancan access control
-
-        class Ability
-            include CanCan::Ability
-            def initialize(user)
-                if user && user.roles.include?(Role.find_by_name("admin"))
-                    can :access, :rails_admin
-                    can :manage, [ #Insert your app models here
-                                  ::Piggybak::Variant,
-                                  ::Piggybak::ShippingMethod,
-                                  ::Piggybak::PaymentMethod,
-                                  ::Piggybak::TaxMethod,
-                                  ::Piggybak::State,
-                                  ::Piggybak::Country]
-                   can [:download, :email, :read, :create, :update, :history, :export], ::Piggybak::Order
-                end
-            end
-        end
-
-
-TODOs
-========
+Visit the project website [here][project-website] to see more documentation and view a demo.
 
-* Test: Test email send functionality
-* Test: Add unit testing
-* Feature: Add API to call Refund if profiles only
-* Feature: Add helper for Google Analytics order tagging
+[project-website]: http://www.piggybak.org/
 
 Copyright
 ========
 
-Copyright (c) 2011 Steph Skardal. See LICENSE.txt for further details.
+Copyright (c) 2011 End Point & Steph Skardal. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/assets/javascripts/piggybak.js

@@ -2,7 +2,9 @@ var tax_total = 0;
 
 $(function() {
 	piggybak.initialize_listeners();
-	piggybak.update_shipping_options($('#piggybak_order_shipping_address_attributes_state_id'));
+	piggybak.update_shipping_options($('#piggybak_order_shipping_address_attributes_state_id'), function() {
+		$('#piggybak_order_shipments_attributes_0_shipping_method_id').val(previous_shipping);
+	});
 	piggybak.update_tax();
 });
 
@@ -35,7 +37,7 @@ var piggybak = {
 			$('#piggybak_order_shipping_address_attributes_state_id').val(state);
 		});
 	},
-	update_shipping_options: function(field) {
+	update_shipping_options: function(field, block) {
 		var shipping_field = $('#piggybak_order_shipments_attributes_0_shipping_method_id');
 		shipping_field.hide();
 		var shipping_data = {};
@@ -56,6 +58,9 @@ var piggybak = {
 				});
 				shipping_field.show();
 				piggybak.update_totals();
+				if(block) {
+					block();
+				}
 			}
 		});
 	},

data/app/assets/javascripts/piggybak.states.js

@@ -41,7 +41,10 @@ var piggybak_states = {
 			new_field = $('<input>');
 		}
 		var old_field = $('#piggybak_order_' + type + '_address_attributes_state_id');
-		new_field.attr('name', old_field.attr('name')).attr('id', old_field.attr('id')).val(old_field.val());
+		new_field.attr('name', old_field.attr('name')).attr('id', old_field.attr('id'));
+		if(old_field.prop('tagName') == new_field.prop('tagName')) {
+			new_field.val(old_field.val());
+		}
 		old_field.replaceWith(new_field);
 
 		if(block) {

data/app/controllers/piggybak/orders_controller.rb

@@ -6,30 +6,19 @@ module Piggybak
       @cart = Piggybak::Cart.new(request.cookies["cart"])
       @order = Piggybak::Order.new
 
-      if current_user
-        @order.user = current_user
-        @order.email = current_user.email 
-      end
-
-      @order.billing_address ||= Piggybak::Address.new
-      @order.shipping_address ||= Piggybak::Address.new
-
-      @order.shipments ||= [Piggybak::Shipment.new] 
-
-      @order.payments ||= [Piggybak::Payment.new] 
+      @order.initialize_user(current_user)
     end
   
     def submit
       response.headers['Cache-Control'] = 'no-cache'
+      @cart = Piggybak::Cart.new(request.cookies["cart"])
 
       begin
         ActiveRecord::Base.transaction do
           @order = Piggybak::Order.new(params[:piggybak_order])
-          @order.user = current_user if current_user
-          @order.payments.first.payment_method_id = Piggybak::PaymentMethod.find_by_active(true).id
+          @order.initialize_user(current_user)
 
-          cart = Piggybak::Cart.new(request.cookies["cart"])
-          @order.add_line_items(cart)
+          @order.add_line_items(@cart)
 
           if @order.save
             Piggybak::Notifier.order_notification(@order)
@@ -42,15 +31,10 @@ module Piggybak
           end
         end
       rescue Exception => e
-        @cart = Piggybak::Cart.new(request.cookies["cart"])
-
-        if current_user
-          @order.user = current_user
-          @order.email = current_user.email 
+        if @order.errors.empty?
+  	      @order.errors.add "", "Your order could not go through. Please try again."
         end
 
-        @user = current_user
-
         render "piggybak/orders/show"
       end
     end
@@ -58,6 +42,11 @@ module Piggybak
     def receipt
       response.headers['Cache-Control'] = 'no-cache'
 
+      if !session.has_key?(:last_order)
+        redirect_to root_url 
+        return
+      end
+
       @order = Piggybak::Order.find(session[:last_order])
     end
 

data/app/helpers/piggybak_helper.rb

@@ -14,4 +14,9 @@ module PiggybakHelper
       link_to text, piggybak.orders_list_url
     end
   end
+  def piggybak_track_order(store_name)
+    if params[:controller] == "piggybak/orders" && params[:action] == "receipt" && session.has_key?(:last_order)
+      render "piggybak/orders/google_analytics", :order => @order, :store_name => store_name
+    end
+  end
 end

data/app/models/piggybak/address.rb

@@ -23,10 +23,14 @@ module Piggybak
       if self.address2 && self.address2 != ''
         address += "#{self.address2}<br />"
       end
-      address += "#{self.city}, #{self.state ? self.state.name : self.state_id} #{self.zip}<br />"
+      address += "#{self.city}, #{self.state_display} #{self.zip}<br />"
       address += "#{self.country.name}"
       address
     end
     alias :display :admin_label  
+
+    def state_display
+      self.state ? self.state.name : self.state_id
+    end
   end
 end

data/app/models/piggybak/order.rb

@@ -23,10 +23,28 @@ module Piggybak
     validates_presence_of :tax_charge
     validates_presence_of :created_at
 
+    after_initialize :initialize_nested
     before_validation :set_defaults
     after_validation :update_totals
     before_save :process_payments, :update_status
 
+    def initialize_nested
+      self.billing_address ||= Piggybak::Address.new
+      self.shipping_address ||= Piggybak::Address.new
+      self.shipments ||= [Piggybak::Shipment.new] 
+      self.payments ||= [Piggybak::Payment.new]
+      if self.payments.any?
+        self.payments.first.payment_method_id = Piggybak::PaymentMethod.find_by_active(true).id
+      end
+    end
+
+    def initialize_user(user)
+      if user
+        self.user = user
+        self.email = user.email 
+      end
+    end
+
     def process_payments
       has_errors = false
       self.payments.each do |payment|
@@ -63,7 +81,11 @@ module Piggybak
       self.tax_charge = 0
 
       self.line_items.each do |line_item|
-        line_item.total = line_item.variant.price * line_item.quantity
+        if line_item.variant
+          line_item.total = line_item.variant.price * line_item.quantity
+        else
+          line_item.total = 0
+        end
       end
     end
 
@@ -71,14 +93,14 @@ module Piggybak
       self.total = 0
 
       self.line_items.each do |line_item|
-        self.total += line_item.total
+        self.total += line_item.total 
       end
 
       self.tax_charge = TaxMethod.calculate_tax(self)
       self.total += self.tax_charge
 
       shipments.each do |shipment|
-        if shipment.new_record? 
+        if shipment.new_record? && shipment.shipping_method
           calculator = shipment.shipping_method.klass.constantize
           shipment.total = calculator.rate(shipment.shipping_method, self)
         end
@@ -90,8 +112,6 @@ module Piggybak
         self.total -= credit.total
       end
 
-      self.total = self.total.to_c
-
       self.total_due = self.total
       payments.each do |payment|
         if payment.status == "paid"
@@ -110,7 +130,7 @@ module Piggybak
       else
         if self.total == 0.00
           self.status = "new"
-        elsif self.shipments.all? { |s| s.status == "shipped" }
+        elsif self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
           self.status = "shipped"
         else
           self.status = "paid"
@@ -126,7 +146,7 @@ module Piggybak
       {
       :address1 => self.billing_address.address1,
       :city     => self.billing_address.city,
-      :state    => self.billing_address.state,
+      :state    => self.billing_address.state_display,
       :zip      => self.billing_address.zip,
       :country  => "US" 
       }

data/app/models/piggybak/payment.rb

@@ -9,6 +9,9 @@ module Piggybak
     validates_presence_of :month
     validates_presence_of :year
 
+    attr_accessor :number
+    attr_accessor :verification_value
+
     def status_enum
       ["paid", "refunded"]
     end
@@ -40,8 +43,6 @@ module Piggybak
         gateway_response = gateway.authorize(self.order.total_due*100, credit_card, :address => self.order.avs_address)
         if gateway_response.success?
           self.attributes = { :total => self.order.total_due, 
-                              :number => 'hidden',
-                              :verification_value => 'hidden',
                               :transaction_id => payment_gateway.transaction_id(gateway_response) } 
           gateway.capture(1000, gateway_response.authorization)
           return true

data/app/views/piggybak/orders/_google_analytics.html.erb

@@ -0,0 +1,23 @@
+var _gaq = _gaq || [];
+_gaq.push(['_addTrans',
+  '<%= @order.id %>',
+  '<%= store_name %>', 
+  '<%= @order.total %>',
+  '<%= @order.tax_charge %>',
+  '<%= @order.shipments.first.total %>',
+  '<%= @order.billing_address.city %>',
+  '<%= @order.billing_address.state_display %>',
+  '<%= @order.billing_address.country.name %>'
+]);
+
+<% @order.line_items.each do |line_item| -%>
+_gaq.push(['_addItem',
+  '<%= @order.id %>',
+  '<%= line_item.variant.sku %>',
+  '<%= line_item.variant.description %>', 
+  '',   // category or variation
+  '<%= line_item.variant.price %>', //unit price
+  '<%= line_item.quantity %>'
+]);
+<% end -%>
+_gaq.push(['_trackTrans']); //submits transaction to the Analytics servers

data/app/views/piggybak/orders/show.html.erb

@@ -114,4 +114,9 @@
 var shipping_lookup = "<%= piggybak.orders_shipping_url %>"; 
 var tax_lookup = "<%= piggybak.orders_tax_url %>"; 
 var geodata_lookup = "<%= piggybak.orders_geodata_url %>"; 
+<% if params.has_key?(:piggybak_order) &&  params[:piggybak_order].has_key?(:shipments_attributes) -%>
+var previous_shipping = <%= params[:piggybak_order][:shipments_attributes]["0"][:shipping_method_id] %>;
+<% else -%>
+var previous_shipping = "";
+<% end -%>
 </script>

data/app/views/rails_admin/main/_form_nested_no_destroy.html.haml

@@ -1,7 +1,15 @@
 = form.fields_for field.name do |nested_form|
   %blockquote
     - if nested_form.object.new_record?
-      = nested_form.link_to_remove "cancel", :class => 'label notice'
+      = nested_form.link_to_remove "cancel", :class => 'label notice', :id => "payments_cancel"
     = nested_form.generate({:action => :create, :model_config => field.associated_model_config, :nested_in => field.name })
     %hr
-= form.link_to_add t("admin.index.add_new"), field.name, :class => 'label notice'
+= form.link_to_add t("admin.index.add_new"), field.name, :class => 'label notice', :id => "payments_add"
+
+:javascript
+    $('#payments_add').live('click', function() {
+      $(this).hide();
+    });
+    $('#payments_cancel').live('click', function() {
+      $('#payments_add').show();
+    });

data/db/migrate/20120111195534_drop_cc_fields.rb

@@ -0,0 +1,11 @@
+class DropCcFields < ActiveRecord::Migration
+  def up
+    remove_column :payments, :number
+    remove_column :payments, :verification_value
+  end
+
+  def down
+    add_column :payments, :number, :string
+    add_column :payments, :verification_value, :string
+  end
+end

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-01-09"
+  s.date = "2012-01-11"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
     "app/views/piggybak/notifier/order_notification.text.erb",
     "app/views/piggybak/orders/_address_form.html.erb",
     "app/views/piggybak/orders/_details.html.erb",
+    "app/views/piggybak/orders/_google_analytics.html.erb",
     "app/views/piggybak/orders/download.text.erb",
     "app/views/piggybak/orders/list.html.erb",
     "app/views/piggybak/orders/no_access.text.erb",
@@ -87,6 +88,7 @@ Gem::Specification.new do |s|
     "db/migrate/20120104020930_populate_countries_and_states.rb",
     "db/migrate/20120106010412_create_credits.rb",
     "db/migrate/20120107135459_add_active_to_countries.rb",
+    "db/migrate/20120111195534_drop_cc_fields.rb",
     "lib/acts_as_orderer/base.rb",
     "lib/acts_as_variant/base.rb",
     "lib/currency.rb",

metadata

@@ -2,7 +2,7 @@
 name: piggybak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Steph Skardal
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: countries
@@ -153,6 +153,7 @@ files:
 - app/views/piggybak/notifier/order_notification.text.erb
 - app/views/piggybak/orders/_address_form.html.erb
 - app/views/piggybak/orders/_details.html.erb
+- app/views/piggybak/orders/_google_analytics.html.erb
 - app/views/piggybak/orders/download.text.erb
 - app/views/piggybak/orders/list.html.erb
 - app/views/piggybak/orders/no_access.text.erb
@@ -181,6 +182,7 @@ files:
 - db/migrate/20120104020930_populate_countries_and_states.rb
 - db/migrate/20120106010412_create_credits.rb
 - db/migrate/20120107135459_add_active_to_countries.rb
+- db/migrate/20120111195534_drop_cc_fields.rb
 - lib/acts_as_orderer/base.rb
 - lib/acts_as_variant/base.rb
 - lib/currency.rb
@@ -200,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3349211022741350095
+      hash: 379901271419735142
       segments: 
       - 0
       version: "0"