muck-commerce 0.1.8 → 0.1.9

data/README.rdoc

@@ -1,6 +1,6 @@
 = muck-commerce
 
-A commerce engine for muck
+A commerce engine for the muck framework.
 
 == Configuration
 
@@ -57,6 +57,10 @@ Add acts_as_muck_commerce_user to user.rb
     acts_as_muck_commerce_user
   end
   
+The muck commerce engine is setup to use coupons as referral codes for users. To automatically create a coupon code for
+each user add this code to user.rb
+  after_create {|user| user.create_referral_code unless user.referral_code}
+ 
 == Create Models
 billing_information.rb
 acts_as_muck_billing_information

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/app/controllers/admin/muck/coupons_controller.rb

@@ -3,7 +3,7 @@ class Admin::Muck::CouponsController < Admin::Muck::BaseController
   before_filter :get_coupon, :only => [:edit, :update, :destroy]
   
   def index
-    @coupons = Coupon.by_newest
+    @coupons = Coupon.default.by_newest
     render :template => 'admin/coupons/index'
   end
 
@@ -21,6 +21,7 @@ class Admin::Muck::CouponsController < Admin::Muck::BaseController
       @coupon.use_limit = 1
       @coupon.uses = 0
       @coupon.code = Coupon.random_code
+      @coupon.coupon_type = CouponType.default
       @coupon.save!
       MuckCommerceMailer.deliver_coupon_code(email, params[:subject], params[:message], @coupon.code)
     end    
@@ -37,6 +38,7 @@ class Admin::Muck::CouponsController < Admin::Muck::BaseController
   
   def create
     @coupon = Coupon.new(params[:coupon])
+    @coupon.coupon_type = CouponType.default
     @coupon.save!
     redirect_to admin_coupons_path
   rescue ActiveRecord::RecordInvalid => ex

data/app/controllers/muck/subscriptions_controller.rb

@@ -4,7 +4,7 @@ class Muck::SubscriptionsController < ApplicationController
   
   before_filter :login_required
   
-  ssl_required :new, :reciept, :confirm, :create, :update
+  ssl_required :new, :receipt , :confirm, :create, :update
   
   def show
     @subscription = current_user.subscriptions.find(params[:id]) rescue nil
@@ -81,6 +81,69 @@ class Muck::SubscriptionsController < ApplicationController
     redirect_to new_subscription_path 
   end
   
+  # Paypal functionality
+  # def express
+  #   response = PAYPAL_EXPRESS_GATEWAY.setup_purchase(calculate_amount,
+  #     :ip                => request.remote_ip,
+  #     :return_url        => process_express_user_lookup_url(@user),
+  #     :cancel_return_url => edit_user_lookup_url(@user, @lookup)
+  #   )
+  #   redirect_to PAYPAL_EXPRESS_GATEWAY.redirect_url_for(response.token)
+  # end
+  # 
+  # def process_express
+  #   @lookup.amount = calculate_amount
+  #   @lookup.save!    
+  #   response = PAYPAL_EXPRESS_GATEWAY.purchase(@lookup.amount, :ip => request.remote_ip, :token => params[:token], :payer_id => params[:PayerID], :order_id => @lookup.order.order_number)
+  #   purchase = OrderTransaction.parse_response(response, 'paypal express purcahse', @lookup.amount)
+  #   @lookup.transactions << purchase
+  #   @lookup.finish!
+  #   respond_to do |format|
+  #     format.html { redirect_to user_lookup_path(@user, @lookup) }
+  #   end  
+  # end
+  # 
+  # # let the user pay with paypal
+  # def express
+  #   description = 'sign up for stuff'
+  #   response = PAYPAL_EXPRESS_RECURRING_GATEWAY.setup_agreement(
+  #     :description => description, 
+  #     :ip => request.remote_ip,
+  #     :return_url => process_express_new_order_url, 
+  #     :cancel_return_url => root_url)
+  #   redirect_to PAYPAL_EXPRESS_RECURRING_GATEWAY.redirect_url_for(response.token)
+  # end
+  # 
+  # def process_express
+  #   amount = 100
+  #   token = params[:token]
+  #   response = PAYPAL_EXPRESS_RECURRING_GATEWAY.create_profile(params[:token], 
+  #     :ip => request.remote_ip,
+  #     :description => description, 
+  #     :start_date => start_date, 
+  #     :frequency => frequency_in_months, 
+  #     :amount => amount_in_dollars, 
+  #     :auto_bill_outstanding => true,
+  #     :payer_id => params[:PayerID], 
+  #     :order_id => '101')
+  # 
+  #   # Save this profile_id in your transactions table.  This is used to cancel/modify the plan in the future.
+  #   profile_id = response.params["profile_id"]
+  # 
+  #   if response.success?
+  #     flash[:notice] = "Your PayPal account was successfully set up for the <strong>#{description}</strong> payment plan."
+  #     redirect_to login_path
+  #   else
+  #     flash.now[:notice] = "There was a problem setting up your PayPal account for the <strong>#{description}</strong> payment plan"
+  #     render cancel_url
+  #   end
+  # end
+  # 
+  # def cancel
+  #   response = PAYPAL_EXPRESS_GATEWAY.cancel_profile(paypal_profile_id, :note => 'Payment plan was canceled by user')
+  #   flash[:notice] = 'You have successfully canceled your membership'
+  # end
+  
   protected
 
     def new_action(message = nil)

data/config/muck_commerce_routes.rb

@@ -4,7 +4,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :orders, :controller => 'muck/orders'
   map.resources :cart_items, :controller => 'muck/cart_items'
   map.resource :cart, :controller => 'muck/carts'
-  map.resources :subscriptions, :controller => 'muck/subscriptions'
+  map.resources :subscriptions, :controller => 'muck/subscriptions', :member => { :receipt => :get, :confirm => :get, :confirm_unsubscribe => :get }
 
   # admin
   map.namespace :admin do |a|

data/db/migrate/20100327171239_add_subscription_records.rb

@@ -0,0 +1,14 @@
+class AddSubscriptionRecords < ActiveRecord::Migration
+  def self.up
+    create_table :subscription_records do |t|
+      t.integer :subscription_id
+      t.integer :amount
+      t.timestamps
+    end
+    add_index :subscription_records, :subscription_id
+  end
+
+  def self.down
+    drop_table :subscription_records
+  end
+end

data/lib/active_record/acts/muck_commerce_user.rb

@@ -9,6 +9,12 @@ module ActiveRecord
       module ClassMethods
         
         # +acts_as_muck_commerce_user+ ties a user into the muck commerce system and adds order, carts, etc.
+        # Access cart using:
+        #   @user.cart
+        # Access default billing information:
+        #   @user.billing_information 
+        # Each user can have a referral code which can be accessed using:
+        #   @user.referral_code
         def acts_as_muck_commerce_user
           
           has_one :cart, :as => :cartable, :dependent => :destroy
@@ -16,7 +22,8 @@ module ActiveRecord
           has_many :order_transactions, :as => :transactionable, :dependent => :destroy
           has_many :orders, :as => :orderable
           has_many :subscriptions, :dependent => :destroy
-          
+          has_one :referral_coupon_code, :class_name => 'Coupon'
+            
           include ActiveRecord::Acts::MuckCommerceUser::InstanceMethods
           extend ActiveRecord::Acts::MuckCommerceUser::SingletonMethods
         end
@@ -56,7 +63,11 @@ module ActiveRecord
         def build_billing_information(billing_information)
           BillingInformation.new(billing_information.merge(:default => true, :user_id => self.id))  
         end
-
+        
+        def referral_code
+          self.referral_coupon_code ||= Coupon.create(:code => Coupon.random_code, :unlimited => true, :coupon_type => CouponType.user_referral)
+        end
+        
       end
       
     end

data/lib/active_record/acts/muck_coupon.rb

@@ -20,6 +20,9 @@ module ActiveRecord
           named_scope :by_newest, :order => 'created_at DESC'
           named_scope :active, :conditions => 'coupons.expires_at > Now() AND coupons.uses <= use_limit'
 
+          named_scope :referrals, lambda { { :conditions => ["coupon_type_id = ? ", CouponType.user_referral] } }
+          named_scope :default, lambda { { :conditions => ["coupon_type_id = ? ", CouponType.default] } }                                                                                                                                            
+
           include ActiveRecord::Acts::MuckCoupon::InstanceMethods
           extend ActiveRecord::Acts::MuckCoupon::SingletonMethods
         end

data/lib/active_record/acts/muck_coupon_type.rb

@@ -19,7 +19,15 @@ module ActiveRecord
 
       # class methods
       module SingletonMethods
-       
+        
+        def user_referral
+          self.find_or_create_by_name('Referral')
+        end
+        
+        def default
+          self.find_or_create_by_name('Default')
+        end
+        
       end
 
       # All the methods available to a record that has had <tt>acts_as_muck_billing_information</tt> specified.

data/lib/active_record/acts/muck_subscription.rb

@@ -14,7 +14,8 @@ module ActiveRecord
 
           belongs_to :user
           belongs_to :subscription_plan
-
+          
+          has_many :subscription_records
           has_many :order_coupons
           has_many :coupons, :through => :subscription_coupons
           has_many :order_transactions, :as => :transactionable, :dependent => :destroy

data/lib/active_record/acts/muck_subscription_record.rb

@@ -0,0 +1,35 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckSubscriptionRecord #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      
+      module ClassMethods
+
+        # Subscription records are used to record extra information each time a
+        # subscription is billed.
+        def acts_as_muck_subscription_record(options = {})
+          
+          validates_presence_of :amount
+          belongs_to :subscription
+          
+          include ActiveRecord::Acts::MuckSubscriptionRecord::InstanceMethods
+          extend ActiveRecord::Acts::MuckSubscriptionRecord::SingletonMethods
+        end
+      
+      end
+      
+      # class methods
+      module SingletonMethods
+      end
+  
+      # All the methods available to a record that has had <tt>acts_as_muck_subscription_plan</tt> specified.
+      module InstanceMethods
+      end
+    
+    end
+
+  end
+
+end

data/lib/muck_commerce.rb

@@ -20,6 +20,7 @@ ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckOrderTransaction
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckOrderCoupon }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckSubscription }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckSubscriptionPlan }
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckSubscriptionRecord }
 ActionController::Base.class_eval { include ActionController::MuckBillingApplication }
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]

data/lib/test/muck_commerce_factories.rb

@@ -5,8 +5,10 @@ end
 Factory.define :billing_information do |f|
   f.first_name 'test'
   f.last_name 'guy'
+  f.name 'test guy'
+  f.company { Factory.next(:name) }
   f.address1 '345 E'
-  f.city 'smalltown'
+  f.city { Factory.next(:name) }
   f.state {|a| a.association(:state) }
   f.country {|a| a.association(:country) }
   f.postal_code '88888'
@@ -96,6 +98,7 @@ Factory.define :coupon do |f|
   f.uses 0
   f.use_limit 1
   f.unlimited false
+  f.coupon_type CouponType.default
   f.expires_at { Date.new((DateTime.now.year + 2), 10, 10) }
 end
 
@@ -103,6 +106,11 @@ Factory.define :cart do |f|
   f.cartable {|a| a.association(:user)} 
 end
 
+Factory.define :cart_coupon do |f|
+  f.cart {|a| a.association(:cart)}
+  f.coupon {|a| a.association(:coupon)}
+end
+
 def default_billing(options = {})
   { :first_name => 'test',
     :last_name => 'dude',

data/muck-commerce.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-commerce}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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-03-17}
+  s.date = %q{2010-03-29}
   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 = [
@@ -81,6 +81,7 @@ Gem::Specification.new do |s|
      "db/migrate/20100228060913_create_subscription_coupons.rb",
      "db/migrate/20100309183304_add_coupon_subscrption_uses.rb",
      "db/migrate/20100310180031_create_coupon_types.rb",
+     "db/migrate/20100327171239_add_subscription_records.rb",
      "lib/action_controller/muck_billing_application.rb",
      "lib/active_record/acts/muck_billing_information.rb",
      "lib/active_record/acts/muck_cart.rb",
@@ -93,6 +94,7 @@ Gem::Specification.new do |s|
      "lib/active_record/acts/muck_order_transaction.rb",
      "lib/active_record/acts/muck_subscription.rb",
      "lib/active_record/acts/muck_subscription_plan.rb",
+     "lib/active_record/acts/muck_subscription_record.rb",
      "lib/muck_commerce.rb",
      "lib/muck_commerce/cart_methods.rb",
      "lib/muck_commerce/configure.rb",
@@ -122,6 +124,7 @@ Gem::Specification.new do |s|
      "test/rails_root/app/models/cart.rb",
      "test/rails_root/app/models/cart_coupon.rb",
      "test/rails_root/app/models/coupon.rb",
+     "test/rails_root/app/models/coupon_type.rb",
      "test/rails_root/app/models/order.rb",
      "test/rails_root/app/models/order_coupon.rb",
      "test/rails_root/app/models/order_transaction.rb",
@@ -158,8 +161,10 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20100123035450_create_access_codes.rb",
      "test/rails_root/db/migrate/20100123233654_create_access_code_requests.rb",
      "test/rails_root/db/migrate/20100206000906_remove_name_fields.rb",
+     "test/rails_root/db/migrate/20100228060913_create_subscription_coupons.rb",
      "test/rails_root/db/migrate/20100309183304_add_coupon_subscrption_uses.rb",
      "test/rails_root/db/migrate/20100310180031_create_coupon_types.rb",
+     "test/rails_root/db/migrate/20100327171239_add_subscription_records.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/lib/tasks/muck.rake",
@@ -181,8 +186,13 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/arrow_right.gif",
      "test/rails_root/public/images/arrow_up.gif",
      "test/rails_root/public/images/blue/preview.gif",
+     "test/rails_root/public/images/fancybox/blank.gif",
+     "test/rails_root/public/images/fancybox/fancy_close.png",
      "test/rails_root/public/images/fancybox/fancy_closebox.png",
      "test/rails_root/public/images/fancybox/fancy_left.png",
+     "test/rails_root/public/images/fancybox/fancy_loading.png",
+     "test/rails_root/public/images/fancybox/fancy_nav_left.png",
+     "test/rails_root/public/images/fancybox/fancy_nav_right.png",
      "test/rails_root/public/images/fancybox/fancy_progress.png",
      "test/rails_root/public/images/fancybox/fancy_right.png",
      "test/rails_root/public/images/fancybox/fancy_shadow_e.png",
@@ -195,7 +205,11 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/fancybox/fancy_shadow_w.png",
      "test/rails_root/public/images/fancybox/fancy_title_left.png",
      "test/rails_root/public/images/fancybox/fancy_title_main.png",
+     "test/rails_root/public/images/fancybox/fancy_title_over.png",
      "test/rails_root/public/images/fancybox/fancy_title_right.png",
+     "test/rails_root/public/images/fancybox/fancybox-x.png",
+     "test/rails_root/public/images/fancybox/fancybox-y.png",
+     "test/rails_root/public/images/fancybox/fancybox.png",
      "test/rails_root/public/images/icons/accept.png",
      "test/rails_root/public/images/icons/add.png",
      "test/rails_root/public/images/icons/blue_guy.png",
@@ -589,6 +603,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/jquery/jquery.jgrowl.js",
      "test/rails_root/public/javascripts/jquery/jquery.js",
      "test/rails_root/public/javascripts/jquery/jquery.metadata.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.mousewheel.js",
      "test/rails_root/public/javascripts/jquery/jquery.queryString.js",
      "test/rails_root/public/javascripts/jquery/jquery.swapimage.js",
      "test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js",
@@ -735,11 +750,14 @@ Gem::Specification.new do |s|
      "test/rails_root/test/functional/admin/billing_informations_controller_test.rb",
      "test/rails_root/test/functional/admin/coupons_controller_test.rb",
      "test/rails_root/test/functional/admin/subscription_plans_controller_test.rb",
-     "test/rails_root/test/functional/billings_information_controller_test.rb",
+     "test/rails_root/test/functional/billing_informations_controller_test.rb",
      "test/rails_root/test/functional/carts_controller_test.rb",
      "test/rails_root/test/functional/orders_controller_test.rb",
      "test/rails_root/test/functional/subscription_controller_test.rb",
      "test/rails_root/test/test_helper.rb",
+     "test/rails_root/test/unit/cart_coupon_test.rb",
+     "test/rails_root/test/unit/coupon_test.rb",
+     "test/rails_root/test/unit/coupon_type_test.rb",
      "test/rails_root/test/unit/order_test.rb",
      "test/rails_root/test/unit/order_transaction_test.rb",
      "test/rails_root/test/unit/subscription_test.rb",
@@ -805,6 +823,7 @@ Gem::Specification.new do |s|
      "test/rails_root/app/models/cart.rb",
      "test/rails_root/app/models/cart_coupon.rb",
      "test/rails_root/app/models/coupon.rb",
+     "test/rails_root/app/models/coupon_type.rb",
      "test/rails_root/app/models/order.rb",
      "test/rails_root/app/models/order_coupon.rb",
      "test/rails_root/app/models/order_transaction.rb",
@@ -838,8 +857,10 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20100123035450_create_access_codes.rb",
      "test/rails_root/db/migrate/20100123233654_create_access_code_requests.rb",
      "test/rails_root/db/migrate/20100206000906_remove_name_fields.rb",
+     "test/rails_root/db/migrate/20100228060913_create_subscription_coupons.rb",
      "test/rails_root/db/migrate/20100309183304_add_coupon_subscrption_uses.rb",
      "test/rails_root/db/migrate/20100310180031_create_coupon_types.rb",
+     "test/rails_root/db/migrate/20100327171239_add_subscription_records.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/public/dispatch.rb",
@@ -851,11 +872,14 @@ Gem::Specification.new do |s|
      "test/rails_root/test/functional/admin/billing_informations_controller_test.rb",
      "test/rails_root/test/functional/admin/coupons_controller_test.rb",
      "test/rails_root/test/functional/admin/subscription_plans_controller_test.rb",
-     "test/rails_root/test/functional/billings_information_controller_test.rb",
+     "test/rails_root/test/functional/billing_informations_controller_test.rb",
      "test/rails_root/test/functional/carts_controller_test.rb",
      "test/rails_root/test/functional/orders_controller_test.rb",
      "test/rails_root/test/functional/subscription_controller_test.rb",
      "test/rails_root/test/test_helper.rb",
+     "test/rails_root/test/unit/cart_coupon_test.rb",
+     "test/rails_root/test/unit/coupon_test.rb",
+     "test/rails_root/test/unit/coupon_type_test.rb",
      "test/rails_root/test/unit/order_test.rb",
      "test/rails_root/test/unit/order_transaction_test.rb",
      "test/rails_root/test/unit/subscription_test.rb",

data/test/rails_root/app/models/coupon_type.rb

@@ -0,0 +1,3 @@
+class CouponType < ActiveRecord::Base
+  acts_as_muck_coupon_type
+end

data/test/rails_root/db/migrate/20091230220327_create_muck_commerce.rb

@@ -47,15 +47,6 @@ class CreateMuckCommerce < ActiveRecord::Migration
     end
     add_index "cart_coupons", ["cart_id", "coupon_id"]
 
-
-    create_table :order_coupons, :force => true do |t|
-      t.integer  "order_id"
-      t.integer  "coupon_id"
-      t.timestamps
-    end
-    add_index "order_coupons", ["order_id", "coupon_id"]
-
-
     create_table :coupons, :force => true do |t|
       t.string   "code"
       t.integer  "amount",     :default => 0,     :null => false
@@ -102,6 +93,14 @@ class CreateMuckCommerce < ActiveRecord::Migration
     add_index "orders", ["orderable_id", "orderable_type"]
 
 
+    create_table :order_coupons, :force => true do |t|
+      t.integer  "order_id"
+      t.integer  "coupon_id"
+      t.timestamps
+    end
+    add_index "order_coupons", ["order_id", "coupon_id"]
+    
+    
     create_table :subscription_plans, :force => true do |t|
       t.string   "name"
       t.string   "sku"
@@ -119,7 +118,6 @@ class CreateMuckCommerce < ActiveRecord::Migration
       t.datetime "next_renewal_at"
       t.string   "aasm_state",              :default => "trial"
       t.integer  "subscription_plan_id"
-      t.integer  "coupon_id"
       t.integer  "renewal_period"
       t.string   "number"
       t.integer  "failed_billing_attempts", :default => 0,       :null => false
@@ -130,7 +128,7 @@ class CreateMuckCommerce < ActiveRecord::Migration
       t.timestamps
     end
     add_index "subscriptions", ["user_id"]
-
+    
   end
 
   def self.down