muck-commerce 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/app/controllers/muck/billing_informations_controller.rb

@@ -26,30 +26,36 @@ class Muck::BillingInformationsController < ApplicationController
   end
 
   def update
-    @success = false
-    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.billable, @billing_information)
-        @billing_information.billable.order_transactions.push(response)
-        if response.success?
-          flash[:notice] = translate('muck.commerce.billing_information_updated_friendly')
-          @success = true
-        else
-          flash[:notice] = translate('muck.commerce.billing_information_update_error_friendly', :error => response.message)
-        end
-      else
-        @success = true
-      end
-    end
+    success, message = update_billing_information(@billing_information)
+    flash[:notice] = message unless success
     render :template => 'billing_informations/edit'
   rescue MuckCommerce::Exceptions::PaymentGatewayError => ex
-    flash[:error]  = translate('muck.commerce.billing_information_update_error_friendly', :error => ex)
+    flash[:error] = translate('muck.commerce.billing_information_update_error_friendly', :error => ex)
     render :template => 'billing_informations/edit'
   end
 
   protected
   
+    def update_billing_information(billing_information)
+      success = false
+      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.billable, billing_information)
+          billing_information.billable.order_transactions.push(response)
+          if response.success?
+            message = translate('muck.commerce.billing_information_updated_friendly')
+            success = true
+          else
+            message = translate('muck.commerce.billing_information_update_error_friendly', :error => response.message)
+          end
+        else
+          success = true
+        end
+      end
+      [success, message]
+    end
+    
     def setup_billing_information
       @billing_information = current_user.billing_informations.find(params[:id]) rescue nil
       @billing_information ||= current_user.billing_information

data/lib/active_record/acts/muck_subscription.rb

@@ -185,11 +185,6 @@ module ActiveRecord
           succeeded_count = results.select {|result| result == true}.length
           "#{message}\tProcessed: #{results.size}\tFailed: #{failure_count}\tSucceeded: #{succeeded_count}"
         end
-
-        private
-        def timestamp_attribute(attribute_name, time = Time.now)
-          self.update_attribute(attribute_name, time)
-        end
        
       end
       
@@ -197,19 +192,16 @@ module ActiveRecord
       module InstanceMethods
         
         def suspend_subscription
-          timestamp_attribute(:suspended_at)
-          self.user.remove_from_role('subscriber')
+          self.update_attribute(:suspended_at, Time.now)
           MessageMailer.deliver_cc_declined(self.user)
         end
 
         def activate_subscription
           self.update_attributes(:activated_at => Time.now, :suspended_at => nil, :cancelled_at => nil)
-          user.roles << Role.find_by_name('subscriber') unless user.subscriber?
         end
 
         def cancel_subscription
-          timestamp_attribute(:cancelled_at)
-          self.user.remove_from_role('subscriber')
+          self.update_attribute(:cancelled_at, Time.now)
         end
 
         def past_due?

data/muck-commerce.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-commerce}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-05-05}
   s.description = %q{Add ecommerce functionality to your muck project.  This includes integration with Paypal and Authorize.net.  This gem uses active merchant and so adding other gateways should be simple.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -06:00
+date: 2010-05-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency