muck-commerce 0.1.9 → 0.2.0

data/README.rdoc

@@ -105,6 +105,12 @@ subscription_record.rb
 The Authorize.net CIM code uses decimals NOT integers like the rest of the ActiveMerchant API.  This means that you must convert
 1000 cents into 10.00 dollars before sending the transaction or else you will bill the user $1000.
 !!!!!!!!!!!!!!!!!!!!!!!!!
+
+== Tests
+This project includes tests that run local and tests that run against a remote test gateway. After configuring all required settings
+in global_config.yml you can run remote tests against a live test gateway with:
+
+rake test:remote
   
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/app/controllers/muck/billing_informations_controller.rb

@@ -29,7 +29,7 @@ class Muck::BillingInformationsController < ApplicationController
     if @billing_information.update_attributes(params[:billing_information])
       if MuckCommerce::Configure.cim_enabled?
         # update billing info in the CIM
-        response = OrderTransaction.cim_create_update(@billing_information)
+        response = OrderTransaction.cim_create_update(@billing_information.billable, @billing_information)
         @billing_information.billable.order_transactions.push(response)
         if response.success?
           flash[:notice] = translate('muck.commerce.billing_information_updated_friendly')

data/app/controllers/muck/orders_controller.rb

@@ -8,9 +8,10 @@ class Muck::OrdersController < ApplicationController
   ssl_required :express, :new, :create
 
   before_filter :store_location
+  before_filter :login_required, :except => [:new]
   before_filter :get_user
 
-  # Enable these if using the cart system
+  # Enable these in overriden controller if using the cart system
   #before_filter :recover_cart, :only => [:new, :express, :create, :update]
   #before_filter :check_empty_cart, :only => [:express, :new, :create]
 
@@ -46,22 +47,24 @@ class Muck::OrdersController < ApplicationController
   end
 
   def create
+    options = {}
     @paypal_express_checkout = false
+    valid = true
     if params[:paypal]
       @order = current_user.orders.build(params[:order])
       @order.ip_address = request.remote_ip
       @order.paypal_express_checkout(get_order_amount)
       @paypal_express_checkout = true
     else
+      
       if @user.blank?
         @user = User.new(params[:user])
         @user.save!
         # valid payment information should be enough to log the user in
         @user.force_activate!
         self.current_user = @user
-        
-      else
-        @user.update_attributes(params[:user])
+      elsif params[:user]
+        @user.update_attributes!(params[:user])
       end
       
       @order ||= Order.new
@@ -74,20 +77,29 @@ class Muck::OrdersController < ApplicationController
       @billing_information = @user.billing_information
 
       if @billing_information.blank?
+        raise MuckCommerce::Exceptions::PaymentGatewayError, I18n.translate('muck.commerce.missing_billing_information') unless params[:billing_information]
         @billing_information = @user.billing_informations.create(params[:billing_information].merge(:payment_method => 'CC', :default => true))
         @billing_information.save!
-      else
-        @billing_information.update_attributes!(params[:@billing_information])
+      elsif params[:billing_information]
+        @billing_information.update_attributes!(params[:billing_information])
+        raise ActiveRecord::RecordInvalid, @billing_information unless @billing_information.billing_valid?
+        options[:update_billing_information] = true
       end
 
       # Validate billing information
-      @billing_information.billing_valid?
-      
-      @order.checkout(@billing_information, get_order_amount, @coupon_codes)
+      if valid = @billing_information.has_billing_profile? || @billing_information.billing_valid?
+        @order.checkout(@billing_information, get_order_amount, @coupon_codes, options)
+      end
     end
 
     respond_to do |format|
-      format.html { redirect_to user_order_path(@user, @order, :new_order => true) }
+      format.html do
+        if valid
+          redirect_to user_order_path(@user, @order, :new_order => true)
+        else
+          render :template => 'orders/new'
+        end
+      end
     end
 
   rescue MuckCommerce::Exceptions::PaymentGatewayError => ex

data/app/controllers/muck/subscriptions_controller.rb

@@ -78,7 +78,7 @@ class Muck::SubscriptionsController < ApplicationController
     @subscription = Subscription.find(params[:id])
     @subscription.destroy
     flash[:notice] = translate('muck.commerce.subscription_deleted')
-    redirect_to new_subscription_path 
+    redirect_to new_subscription_path
   end
   
   # Paypal functionality

data/db/migrate/20100408035338_move_customer_profile_id.rb

@@ -0,0 +1,18 @@
+class MoveCustomerProfileId < ActiveRecord::Migration
+  def self.up
+    add_column :users, :customer_profile_id, :string, :limit => 512
+    BillingInformation.all.each do |bi|
+      bi.billable.update_attribute(:customer_profile_id, bi.customer_profile_id)
+    end
+    remove_column :billing_informations, :customer_profile_id
+  end
+
+  def self.down
+    add_column :billing_informations, :customer_profile_id, :string, :limit => 512
+    BillingInformation.all.each do |bi|
+      bi.update_attribute(:customer_profile_id, bi.billable.customer_profile_id)
+    end
+    remove_column :users, :customer_profile_id
+  end
+  
+end

data/lib/action_controller/muck_billing_application.rb

@@ -53,9 +53,9 @@ module ActionController
           if success = @billing_information.credit_card.valid?
             success = @billing_information.save
             if success
-              if GlobalConfig.cim_gateway
+              if MuckCommerce::Configure.cim_enabled?
                 begin
-                  response = OrderTransaction.cim_create(@billing_information)
+                  response = OrderTransaction.cim_create(@user, @billing_information)
                   @user.order_transactions.push(response)
                 rescue MuckCommerce::Exceptions::PaymentGatewayError => ex
                   flash[:error] = I18n.translate('muck.commerce.billing_information_problem', :message => ex.to_s)

data/lib/active_record/acts/muck_billing_information.rb

@@ -126,7 +126,7 @@ module ActiveRecord
           message = ''
           if MuckCommerce::Configure.cim_enabled?
             # Update CIM if billing information has changed
-            response = OrderTransaction.cim_create_update(@billing_information, @billing_information.credit_card_number_available?)
+            response = OrderTransaction.cim_create_update(@billing_information.billable, @billing_information, @billing_information.credit_card_number_available?)
             if response.success?
               message = translate('muck.commerce.billing_information_updated')
             else
@@ -203,7 +203,7 @@ module ActiveRecord
         end
    
         def has_billing_profile? 
-          !self.customer_profile_id.blank? || !self.customer_payment_profile_id.blank?
+          !self.billable.customer_profile_id.blank? && !self.customer_payment_profile_id.blank?
         end
    
         private

data/lib/active_record/acts/muck_cart_item.rb

@@ -0,0 +1,38 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckCartItem #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+
+        # Use this class to link any object into the cart. The object must implement and 'amount' method
+        def acts_as_muck_cart_item(options = {})
+          include MuckCommerce::CurrencyMethods
+          include MuckCommerce::DiscountMethods
+          
+          belongs_to :cart
+          belongs_to :cartable, :polymorphic => true
+          
+          include ActiveRecord::Acts::MuckCart::InstanceMethods
+          extend ActiveRecord::Acts::MuckCart::SingletonMethods
+        end
+
+      end
+
+      # class methods
+      module SingletonMethods
+
+      end
+
+      # All the methods available to a record that has had <tt>acts_as_muck_cart</tt> specified.
+      module InstanceMethods
+        
+      end
+      
+    end
+
+  end
+
+end

data/lib/active_record/acts/muck_commerce_user.rb

@@ -35,6 +35,11 @@ module ActiveRecord
       
       module InstanceMethods
 
+        # This is the description that will be passed to the CIM system
+        def cim_description
+          self.display_name
+        end
+        
         def subscription
           @default_subscription ||= self.subscriptions.default.first
         end

data/lib/active_record/acts/muck_order.rb

@@ -99,9 +99,11 @@ module ActiveRecord
               success = true
             else
 
-              if MuckCommerce::Configure.cim_enabled? && !billing_information.has_billing_profile?
-                response = OrderTransaction.cim_create(billing_information)
-                raise MuckCommerce::Exceptions::PaymentGatewayError, I18n.translate('muck.commerce.problem_processing_your_order', :message => response.message) unless response.success?
+              if MuckCommerce::Configure.cim_enabled? 
+                if !billing_information.has_billing_profile? || options[:update_billing_information]
+                  response = OrderTransaction.cim_create_update(billing_information.billable, billing_information)
+                  raise MuckCommerce::Exceptions::PaymentGatewayError, I18n.translate('muck.commerce.problem_processing_your_order', :message => response.message) unless response.success?
+                end
               end
 
               if GlobalConfig.authorize_orders_first

data/lib/active_record/acts/muck_order_transaction.rb

@@ -58,7 +58,7 @@ module ActiveRecord
             :type => :auth_only,
             :amount => sprintf("%.2f", amount.to_f / 100) # Convert into decimal amount.  HACK/TODO the rest of the library uses cents.  One day this value might need to be cents instead of dollars
           }
-          transaction[:customer_profile_id] = billing_information.customer_profile_id
+          transaction[:customer_profile_id] = billing_information.billable.customer_profile_id
           transaction[:customer_payment_profile_id] = billing_information.customer_payment_profile_id
           process(I18n.translate('muck.commerce.authorization_cim'), amount, true) do |gw|
             gw.create_customer_profile_transaction(:transaction => transaction)
@@ -72,7 +72,7 @@ module ActiveRecord
             :type => :auth_capture,
             :amount => sprintf("%.2f", amount.to_f / 100) # Convert into decimal amount.  HACK/TODO the rest of the library uses cents.  One day this value might need to be cents instead of dollars
           }
-          transaction[:customer_profile_id] = billing_information.customer_profile_id
+          transaction[:customer_profile_id] = billing_information.billable.customer_profile_id
           transaction[:customer_payment_profile_id] = billing_information.customer_payment_profile_id
           process(I18n.translate('muck.commerce.purchase_cim'), amount, true) do |gw|
             gw.create_customer_profile_transaction(:transaction => transaction)
@@ -80,118 +80,162 @@ module ActiveRecord
         end
 
         # Creates an entry in the CIM system for the given billing information
-        def cim_create(billing_information)
+        def cim_create(billable, billing_information)
           process(I18n.translate('muck.commerce.cim_create'), 0, true) do |gw|
-            response = gw.create_customer_profile(:profile => get_cim_profile(billing_information))
+            response = gw.create_customer_profile(:profile => get_cim_profile(billing_information.billable, billing_information))
             if response.success?
               # these are protected attributes so mass updates are not allowed
-              billing_information.customer_profile_id = response.authorization
+              billable.customer_profile_id = response.authorization
+              billable.save!
               billing_information.customer_payment_profile_id = response.params["customer_payment_profile_id_list"]["numeric_string"]
               billing_information.save!
+              billing_information.reload # associated billable object has changed and needs to be reloaded
             end
             response
           end
         end
 
-        # Updates information in the CIM system
-        def cim_update(billing_information, validate = true)
-          profile = get_cim_profile(billing_information, validate)
-          profile[:customer_profile_id] = billing_information.customer_profile_id
+        # Updates user information in the CIM system
+        def cim_update(billable, validate = true)
+          profile = get_cim_profile(billable, nil, validate)
+          profile[:customer_profile_id] = billable.customer_profile_id
           process(I18n.translate('muck.commerce.cim_update_user'), 0, true) do |gw|
             gw.update_customer_profile(:profile => profile)
           end
         end
 
+        # Updates billing information in the CIM system
+        def cim_update_payment_profile(billing_information, validate = true)
+          profile = get_cim_payment_profile(billing_information, validate)
+          process(I18n.translate('muck.commerce.cim_update_payment_profile'), 0, true) do |gw|
+            gw.update_customer_payment_profile( :customer_profile_id => billing_information.billable.customer_profile_id,
+                                                :payment_profile => profile)
+          end
+        end
+
         # Creates or updates billing information in the CIM based on whether or not it already exists.
-        def cim_create_update(billing_information, validate = true)
+        def cim_create_update(billable, billing_information, validate = true)
           if billing_information.has_billing_profile?
-            self.cim_update(billing_information, validate)
+            response = self.cim_update(billable, validate)
+            if response.success?
+              self.cim_update_payment_profile(billing_information, validate)
+            else
+              response
+            end
           else
-            self.cim_create(billing_information)
+            self.cim_create(billable, billing_information)
           end
         end
 
         # Remove billing information from the CIM system.
-        def cim_delete(billing_information)
+        def cim_delete(customer_profile_id)
+          cim_delete_by_customer_profile_id(customer_profile_id)
+        end
+
+        def cim_delete_by_customer_profile_id(customer_profile_id)
           process(I18n.translate('muck.commerce.cim_delete_user'), 0, true) do |gw|
-            gw.delete_customer_profile(:customer_profile_id => billing_information.customer_profile_id) 
+            gw.delete_customer_profile(:customer_profile_id => customer_profile_id) 
           end
         end
     
         # validates an existing profile
-        def cim_validate_user(billing_information)
+        def cim_validate_customer_payment_profile(billing_information)
           process(I18n.translate('muck.commerce.cim_validate_profile'), 0, true) do |gw|
             gw.validate_customer_payment_profile(
-            :customer_profile_id => billing_information.customer_profile_id,
-            :customer_payment_profile_id => billing_information.customer_payment_profile_id,
-            :validation_mode => :live)
+              :customer_profile_id => billing_information.billable.customer_profile_id,
+              :customer_payment_profile_id => billing_information.customer_payment_profile_id,
+              :validation_mode => :live)
           end
         end
     
+        # Gets an existing profile
+        def cim_get_customer_profile(customer_profile_id)
+          process(I18n.translate('muck.commerce.cim_get_customer_profile'), 0, true) do |gw|
+            gw.get_customer_profile(
+            :customer_profile_id => customer_profile_id)
+          end
+        end
+
+        # Gets an existing  customer payment profile
+        def cim_get_customer_payment_profile(customer_profile_id, customer_payment_profile_id)
+          process(I18n.translate('muck.commerce.cim_get_payment_customer_profile'), 0, true) do |gw|
+            gw.get_customer_payment_profile(
+            :customer_profile_id => customer_profile_id,
+            :customer_payment_profile_id => customer_payment_profile_id)
+          end
+        end
+        
         # Transfer money to an email account using paypal
         def send_money_via_paypal(amount, email, options = {})
           process(I18n.translate('muck.commerce.send_money_via_paypal'), amount) do |gw|
             gw.transfer(amount, email, options)
-          end      
+          end
         end
         
-        private
-
-          # Get a profile object compatible with the CIM system.
-          def get_cim_profile (billing_information, validate = true)
-            validate_card(billing_information) if validate
-            billable = billing_information.billable
-            payment = { :credit_card => billing_information.credit_card_for_cim }
-            address = { :first_name => billing_information.first_name,
-                        :last_name => billing_information.last_name }
-            address[:company] = billing_information.company unless billing_information.company.blank?
-            address[:address] = "#{billing_information.address1} #{billing_information.address2}" unless billing_information.address1.blank?
-            address[:city] = billing_information.city unless billing_information.city.blank?
-            address[:state] = billing_information.state.name unless billing_information.state.blank?
-            address[:country] = billing_information.country.name unless billing_information.country.blank?
-            address[:zip] = billing_information.postal_code unless billing_information.postal_code.blank?
-            profile = {
-              :merchant_customer_id => billable.id,
-              :description => "#{billable.type}",
-              :email => billable.email,
-              :payment_profiles => {
-                :customer_type => 'individual',
-                :bill_to => address,
-                :payment => payment
-              }
-            }
-            profile
-          end
-    
-          def validate_card(billing)
-            raise MuckCommerce::Exceptions::PaymentGatewayError, I18n.translate('muck.commerce.invalid_credit_card_information') if !billing.credit_card.valid?
+        # Get a profile object compatible with the CIM system.
+        def get_cim_profile(billable, billing_information = nil, validate = true, customer_type = 'individual')
+          profile = {
+            :merchant_customer_id => billable.id,
+            :description => billable.cim_description,
+            :email => billable.email }
+          if billing_information
+            if billing_information.has_billing_profile?
+              profile[:payment_profile] = get_cim_payment_profile(billing_information, validate, customer_type)
+            else
+              profile[:payment_profiles] = get_cim_payment_profile(billing_information, validate, customer_type)
+            end
           end
-    
-          def process(action, amount = nil, cim_transaction = false)
-            result = OrderTransaction.new
-            result.amount = amount
-            result.action = action
-            begin
-              if cim_transaction
-                response = yield cim_gateway
-              else
-                response = yield gateway
-              end
-              result.success   = response.success?
-              result.reference = response.authorization
-              result.message   = response.message
-              result.params    = response.params
-              result.test      = response.test?        
-            rescue ActiveMerchant::ActiveMerchantError => e
-              result.success   = false
-              result.reference = nil
-              result.message   = e.message
-              result.params    = {}
-              result.test      = gateway.test?
+          profile
+        end
+  
+        def get_cim_payment_profile(billing_information, validate = true, customer_type = 'individual')
+          validate_card(billing_information) if validate
+          payment = { :credit_card => billing_information.credit_card_for_cim }
+          address = { :first_name => billing_information.first_name,
+                      :last_name => billing_information.last_name }
+          address[:company] = billing_information.company unless billing_information.company.blank?
+          address[:address] = "#{billing_information.address1} #{billing_information.address2}" unless billing_information.address1.blank?
+          address[:city] = billing_information.city unless billing_information.city.blank?
+          address[:state] = billing_information.state.name unless billing_information.state.blank?
+          address[:country] = billing_information.country.name unless billing_information.country.blank?
+          address[:zip] = billing_information.postal_code unless billing_information.postal_code.blank?
+          payment_profile = { :customer_type => customer_type,
+                              :bill_to => address,
+                              :payment => payment }
+          payment_profile[:customer_payment_profile_id] = billing_information.customer_payment_profile_id if billing_information.customer_payment_profile_id
+          payment_profile
+        end
+        
+        def validate_card(billing)
+          raise MuckCommerce::Exceptions::PaymentGatewayError, I18n.translate('muck.commerce.invalid_credit_card_information') if !billing.credit_card.valid?
+        end
+  
+        def process(action, amount = nil, cim_transaction = false)
+          result = OrderTransaction.new
+          result.amount = amount
+          result.action = action
+          begin
+            if cim_transaction
+              response = yield cim_gateway
+            else
+              response = yield gateway
             end
-      
-            result
+            result.success   = response.success?
+            result.reference = response.authorization
+            result.message   = response.message
+            result.params    = response.params
+            result.test      = response.test?        
+          rescue ActiveMerchant::ActiveMerchantError => e
+            result.success   = false
+            result.reference = nil
+            result.message   = e.message
+            result.params    = {}
+            result.test      = gateway.test?
           end
+    
+          result
+        end
+        
       end