spree 0.4.1 → 0.5.0

data/CHANGELOG

@@ -1,3 +1,38 @@
+== 0.5.0
+
+* #	55	-	Variants need shipping weights to do shipping calculations.
+* #	66	-	Add a migration generator for extensions
+* #	83	-	Internal Server Error when adding product property to product 
+* #	90	-	Support for sample data in extensions
+* #	91	-	Shipping address should be limited to the countries that are configured by a shipping zone
+* #	92	-	Configuration screen for inventory settings.
+* #	95	-	Bogus gateway should decline card instead of raising an exception
+* #	96	-	Creating first Taxon fails with blank database
+* #	97	-	Exception when returning to cart from shipping method selection screen
+* #	98	-	Exception occurs when changing country dropdown for Ship Address
+* #	99	-	Provide built-in mechanism for dealing with near static content
+* #	100	-	Add support for require gems inside extensions and an easy way to install them.
+* #	101	-	Add configuration setting to make bogus gateway in development mode optional
+* #	102	-	Credit card information is not being stored.
+* #	103	-	Rails 2.1.2 Support
+* #	105	-	Error when viewing order with non US state in either address.
+* #	106	-	Adding a new variant causes NoMethodError
+* #	107	-	SKU not saving for products (empty variant)
+* #	108	-	Correct after_transition for paid state in Order model
+* #	109	-	Add pruchase method to Spree::PaymentGateway
+* #	110	-	Empty address cannot be validated
+* #	112	-	Check for user before emailing order confirmations
+* #	113	-	Property model references bogus value table.
+* #	114	-	Remove unsupported deactivate method from extensions
+* #	116	-	Updating option types causes all option values to disappear
+* #	118	-	Default authenticaiton screen should be login
+* #	119	-	Include login fields on user creation screen
+* #	120	-	Orders search does not return any results.
+* #	122	-	Credit card Number text field enforces 17 character restriction
+* # 124 - Move the pay action out of the FSM for order.
+* # 125 - Sales Tax calculation causes exception
+* # 126 - Incomplete orders are appearing in admin orders views.
+
 == 0.4.1
 
 * #94 - User must be logged in to empty cart

data/CONTRIBUTORS

@@ -14,6 +14,7 @@ core:
 * Sonny Cook
 * Brian Quinn
 * Paul Saieg
+* Edmundo Valle Neto
 * Gregg Pollack
 * Jon Jensen
 * Fabio Akita
@@ -25,8 +26,8 @@ core:
 * Chris Gaskett
 * Will Emerson
 * Ricardo Shiota Yasuda
-* Edmundo Valle Neto
 * tom
+* Yves Dufour
 
 == Legacy Contributors
 

data/README.markdown

@@ -14,16 +14,18 @@ Running from sources (latest and greatest features)
 1. Clone the git repo
 
         git clone git://github.com/schof/spree.git spree
+
+2. Create the necessary config/database.yml file
         
-2. Install the gem dependencies
+3. Install the gem dependencies
 
         rake gems:install
         
-3. Bootstrap the database (run the migrations, create admin account, optionally load sample data.)
+4. Bootstrap the database (run the migrations, create admin account, optionally load sample data.)
 
         rake db:bootstrap
 
-4. Start the server
+5. Start the server
 
         script/server
 
@@ -72,8 +74,8 @@ Deploy spree as a normal rails application. If you use apache+cgi/fastcgi take a
 
     public/.htaccess.example
 
-i18n/l10n Support?
-==================
+i18n/l10n Support
+=================
 
 **Basic** localization and internationalization **support** is now
 added using the [Globalite Plugin][1] from Matt Aimonetti. 
@@ -98,50 +100,4 @@ to be done.
 [3]: http://code.google.com/p/globalite/wiki/UI_Localization
 [4]: http://code.google.com/p/globalite/wiki/PluralizationSupport
 
-**UPDATE:** Take a look at [i18n page on Spree wiki](http://support.spreehq.org/wiki/1/I18n)
-
-Is Spree Ready for Production?
-==============================
-
-I have been asked by several people about the status of the Spree
-project. I thought I would take a moment to address the current state
-of the codebase and whether or not its “production ready.”
-
-In my opinion, you can use Spree in a real world commerce application
-right now. This is especially true if you are already committed to
-using Ruby on Rails. What are the drawbacks to doing this? The major
-drawback is that Spree is still “rough around the edges” so you will
-be doing a lot of the polishing yourself. For instance, if you want to
-have FedEx shipping calculations you will need to write/port your own.
-On the other hand, the basic admin functionality is working and the
-ActiveMerchant plugin support means you don’t have to worry about
-credit cards. In fact, I have already built two production sites with
-this software (under the old RailsCart name).
-
-The only other Rails commerce application I am aware of is Substruct.
-The last I looked at this project it was fairly basic as well. So if
-you are going to start building your Rails project today, you have
-three choices.
-
-1. Write your own
-2. Use Spree as your starting point and do lots of custom coding
-3. Use Substruct as your starting point and do lots of custom coding
-
-If you are uncomfortable with these three options then you should
-consider another application framework.
-
-The good news is that Spree is rapidly improving with each passing
-day. The major effort right now is to rejigger the data model so that
-it is rock solid. There is nothing “wrong” with the current data model
-which is why it is ok to build a production Spree app with the
-existing software. We’re just trying to make the data model as “future
-proof” as possible. The more we improve the data model now, the less
-disruptive it will be for users to upgrade to subsequent versions of
-the software.
-
-When will this refactoring be done? Our goal is to have our first beta
-release in time for RailsConf (May 29). This means we will pushing
-hard for another 6-8 weeks on all things data model. Once we go “beta”
-we be on the next level of stability. There will be a lot less coding
-needed to use Spree for your production site and we also hope to have
-a standardized approach for the custom code you do need to write.
+**UPDATE:** Take a look at [i18n page on Spree wiki](http://support.spreehq.org/wiki/1/I18n)

data/app/controllers/account_controller.rb

@@ -2,7 +2,7 @@ class AccountController < Spree::BaseController
   before_filter :login_from_cookie
 
   def index
-    redirect_to(signup_path) unless logged_in? || User.count > 0
+    redirect_to(login_path) unless logged_in? || User.count > 0
   end
 
   def login

data/app/controllers/addresses_controller.rb

@@ -1,6 +1,7 @@
 class AddressesController < Admin::BaseController
   before_filter :check_existing, :only => :new
   before_filter :load_data
+  before_filter :load_countries, :except => :country_changed
   layout 'application'
   resource_controller :singleton
   
@@ -38,7 +39,10 @@ class AddressesController < Admin::BaseController
     @selected_country_id ||= Spree::Config[:default_country_id]
 
     @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
-    @countries = Country.find(:all)
+  end
+  
+  def load_countries
+    @countries = Country.all
   end
   
   def next_step

data/app/controllers/admin/inventory_settings_controller.rb

@@ -0,0 +1,13 @@
+class Admin::InventorySettingsController < Admin::BaseController
+
+  def update
+    Spree::Config.set(params[:preferences])
+    
+    respond_to do |format|
+      format.html {
+        redirect_to admin_inventory_settings_path
+      }
+    end
+  end
+
+end

data/app/controllers/admin/option_types_controller.rb

@@ -30,7 +30,7 @@ class Admin::OptionTypesController < Admin::BaseController
   end
 
   update.before do 
-    params[:option_type][:option_values] ||= {}
+    params[:option_type][:option_value_attributes] ||= {}
   end
 
   # redirect to index (instead of r_c default of show view)

data/app/controllers/admin/orders_controller.rb

@@ -36,24 +36,30 @@ class Admin::OrdersController < Admin::BaseController
   
   private
   def collection   
-    @filter = OrderFilter.new(params[:filter])
+    @filter = params.has_key?(:filter) ? OrderFilter.new(params[:filter]) : OrderFilter.new(:checkout => "1")
+ 
+    scopes = []
     if params[:filter] and @filter.valid?
       default_stop = (Date.today + 1).to_s(:db)
-      scopes = []
-      scopes << [ :by_number, @filter.number ] if @filter.number
+     
+      scopes << [ :by_number, @filter.number ] unless @filter.number.blank?
       scopes << [ :by_customer, @filter.customer ] unless @filter.customer.blank?
       scopes << [ :between, @filter.start, (@filter.stop.blank? ? default_stop : @filter.stop) ] unless @filter.start.blank?
       scopes << [ :by_state, @filter.state.tableize.singularize.gsub(" ", "_") ] unless @filter.state.blank?
-      @collection = (scopes.inject(Order) {|m,v| m.scopes[v.shift].call(m, *v) }).find(:all, :order => 'orders.created_at DESC', :include => :user,
-        :page => {:size => 15, :current =>params[:p], :first => 1})
+      scopes << [ :checkout_completed, @filter.checkout=='1' ? true : false] unless @filter.checkout.blank?  
+    else
+      scopes << [ :checkout_completed, true]  
     end
-     
-    @collection ||= end_of_association_chain.find(:all, :order => 'created_at DESC', :include => :user,
-      :page => {:size => 15, :current =>params[:p], :first => 1})
+    
+    
+    @collection = (scopes.inject(Order) {|m,v| m.scopes[v.shift].call(m, *v) }).find(:all, :order => 'orders.created_at DESC', :include => :user,
+       :page => {:size => 15, :current =>params[:p], :first => 1})
+
   end
   
   # Allows extensions to add new forms of payment to provide their own display of transactions
   def initialize_txn_partials
     @txn_partials = []
   end
+
 end

data/app/controllers/admin/products_controller.rb

@@ -18,6 +18,7 @@ class Admin::ProductsController < Admin::BaseController
   private
     def load_data
       @tax_categories = TaxCategory.find(:all, :order=>"name")  
+      @shipping_categories = ShippingCategory.find(:all, :order=>"name")  
     end
 
     def set_image
@@ -44,6 +45,7 @@ class Admin::ProductsController < Admin::BaseController
         @object.available_on = Time.now
         @object.variants << Variant.new(:product => @object)
       end
+      @object.variant.sku = params[:product] ? params[:product][:sku] : ""
       @object
     end    
 end

data/app/controllers/admin/variants_controller.rb

@@ -1,6 +1,7 @@
 class Admin::VariantsController < Admin::BaseController
   resource_controller
   belongs_to :product
+  before_filter :load_data, :only => [:index, :edit, :new]
   
   new_action.response do |wants|
     wants.html {render :action => :new, :layout => false}
@@ -22,4 +23,10 @@ class Admin::VariantsController < Admin::BaseController
     wants.html {redirect_to collection_url}
   end
   
+  private
+  def load_data
+    # this allows extensions to provide their own additional columns in the index and edit views
+    @additional_fields = Variant.column_names - ["id", "price", "sku", "product_id"]
+  end
+  
 end

data/app/controllers/content_controller.rb

@@ -0,0 +1,5 @@
+class ContentController < Spree::BaseController
+  def show
+    render :action => params[:path].join('/')
+  end  
+end

data/app/controllers/creditcard_payments_controller.rb

@@ -13,8 +13,8 @@ class CreditcardPaymentsController < Admin::BaseController
     creditcard_payment.creditcard = @payment_presenter.creditcard
     begin
       creditcard_payment.save
-    rescue SecurityError => se
-      flash.now[:error] = "Authorization Error: #{se.message}"
+    rescue Spree::GatewayError => ge
+      flash.now[:error] = "Authorization Error: #{ge.message}"
       render :action => "new" and return 
     end
     @order.next!

data/app/controllers/orders_controller.rb

@@ -1,5 +1,5 @@
 class OrdersController < Admin::BaseController
-  before_filter :login_required, :except => [:create, :edit, :update]
+  before_filter :login_required, :only => [:checkout]
   before_filter :load_object, :only => [:checkout]
   layout 'application'
   
@@ -49,7 +49,23 @@ class OrdersController < Admin::BaseController
     flash nil 
     wants.html {redirect_to new_order_url}
   end
-  
+
+  protected
+  # Custom access denied action for orders.  In the case of an order, we'd like the user to be presented with a user 
+  # signup screen (as opposed to login) since its likely the user does not yet have an account.  The signup screen 
+  # also contains a link to the login screen if they already have an account.
+  def access_denied
+    respond_to do |format|
+      format.html do
+        store_location
+        redirect_to signup_path
+      end
+      format.xml do
+        request_http_basic_authentication 'Web Password'
+      end
+    end
+  end
+    
   private
   def build_object        
     find_order

data/app/helpers/admin/inventory_settings_helper.rb

@@ -0,0 +1,5 @@
+module Admin::InventorySettingsHelper
+  def show_not(true_or_false)
+    true_or_false ? '' : 'not'
+  end
+end

data/app/helpers/admin/product_properties_helper.rb

@@ -3,11 +3,19 @@ module Admin::ProductPropertiesHelper
   # Generates the appropriate field name for attribute_fu.  Normally attribute_fu handles this but we've got a 
   # special case where we need text_field_with_autocomplete and we have to recreate attribute_fu's naming 
   # scheme manually.
-  def property_fu_name(product_property)
+  def property_fu_name(product_property, number)
     if product_property.new_record?
-      "product[product_property_attributes][new][-1][property_name]"   
+      "product[product_property_attributes][new][#{number}][property_name]"
     else
       "product[product_property_attributes][#{product_property.id}][property_name]"   
     end
   end
+
+  def property_fu_value(product_property, number)
+    if product_property.new_record?
+      "product[product_property_attributes][new][#{number}][value]"
+    else
+      "product[product_property_attributes][#{product_property.id}][value]"   
+    end
+  end
 end

data/app/helpers/products_helper.rb

@@ -16,9 +16,9 @@ module ProductsHelper
     diff = product_price(variant, :format_as_currency => false) - product_price(variant.product, :format_as_currency => false)
     return nil if diff == 0
     if diff > 0
-      "(Add: #{format_price diff.abs})"
+      "(#{t("Add")}: #{format_price diff.abs})"
     else
-      "(Subtract: #{format_price diff.abs})"
+      "(#{t("Subtract")}: #{format_price diff.abs})"
     end
   end
   

data/app/models/address.rb

@@ -7,8 +7,8 @@ class Address < ActiveRecord::Base
   validates_presence_of :lastname
   validates_presence_of :address1
   validates_presence_of :city
-  validates_presence_of :state, :unless => Proc.new { |address| address.country.states.length==0 }
-  validates_presence_of :state_name, :if => Proc.new { |address| address.country.states.length==0 }
+  validates_presence_of :state, :unless => Proc.new { |address| address.country && address.country.states.length==0 }
+  validates_presence_of :state_name, :if => Proc.new { |address| address.country &&  address.country.states.length==0 }
   validates_presence_of :zipcode
   validates_presence_of :country
   validates_presence_of :phone

data/app/models/app_configuration.rb

@@ -21,6 +21,7 @@ class AppConfiguration < Configuration
   preference :default_country_id, :integer, :default => 214
   preference :allow_backorders, :boolean, :default => true
   preference :show_descendents, :boolean, :default => true
+  preference :show_zero_stock_products, :boolean, :default => true
 
   validates_presence_of :name
   validates_uniqueness_of :name

data/app/models/creditcard_payment.rb

@@ -14,6 +14,12 @@ class CreditcardPayment < ActiveRecord::Base
   def creditcard=(creditcard)
     @creditcard = creditcard
     self.cc_type = ActiveMerchant::Billing::CreditCard.type?(creditcard.number)
+    self.number = creditcard.number if Spree::Config[:store_cc]
+    self.display_number = creditcard.display_number 
+    self.month = creditcard.month
+    self.year = creditcard.year
+    self.first_name = creditcard.first_name
+    self.last_name = creditcard.last_name
   end
   
   def find_authorization
@@ -23,18 +29,4 @@ class CreditcardPayment < ActiveRecord::Base
                  :conditions => ["txn_type = ? or txn_type = ?", CreditcardTxn::TxnType::AUTHORIZE, CreditcardTxn::TxnType::CAPTURE],
                  :order => 'created_at DESC')
   end
-  
-  # creates a new instance of CreditCard using the active merchant version
-  def self.new_from_active_merchant(cc)
-    card = self.new
-    card.number = cc.number if Spree::Config[:store_cc]
-    card.cc_type = ActiveMerchant::Billing::CreditCard.type?(cc.number)
-    card.display_number = cc.display_number 
-    card.verification_value = cc.verification_value if Spree::Config[:store_cc]
-    card.month = cc.month
-    card.year = cc.year
-    card.first_name = cc.first_name
-    card.last_name = cc.last_name
-    card
-  end
 end

data/app/models/order.rb

@@ -12,9 +12,7 @@ class Order < ActiveRecord::Base
   has_many :state_events
   has_one :creditcard_payment
   belongs_to :user
-  has_one :address, :as => :addressable
-  belongs_to :bill_address, :class_name => "Address", :foreign_key => :bill_address_id
-  belongs_to :ship_address, :class_name => "Address", :foreign_key => :ship_address_id
+  has_one :address, :as => :addressable, :dependent => :destroy
 
   validates_associated :line_items, :message => "are not valid"
   validates_numericality_of :tax_amount
@@ -26,6 +24,8 @@ class Order < ActiveRecord::Base
   named_scope :between, lambda {|*dates| {:conditions => ["orders.created_at between :start and :stop", {:start => dates.first.to_date, :stop => dates.last.to_date}]}}
   named_scope :by_customer, lambda {|customer| {:include => :user, :conditions => ["users.email = ?", customer]}}
   named_scope :by_state, lambda {|state| {:conditions => ["state = ?", state]}}
+  named_scope :checkout_completed, lambda {|state| {:conditions => ["checkout_complete = ?", state]}}
+  
   
   # attr_accessible is a nightmare with attachment_fu, so use attr_protected instead.
   attr_protected :ship_amount, :tax_amount, :item_total, :total, :user, :number, :ip_address, :checkout_complete, :state
@@ -34,7 +34,6 @@ class Order < ActiveRecord::Base
   state_machine :initial => 'in_progress' do    
     after_transition :to => 'in_progress', :do => lambda {|order| order.update_attribute(:checkout_complete, false)}
     after_transition :to => 'authorized', :do => :complete_order
-    after_transition :to => 'paid', :do => lambda {|order| InventoryUnit.sell_units(order)}
     after_transition :to => 'shipped', :do => :mark_shipped
     after_transition :to => 'canceled', :do => :cancel_order
     after_transition :to => 'returned', :do => :restock_inventory
@@ -54,15 +53,8 @@ class Order < ActiveRecord::Base
     event :capture do
       transition :to => 'captured', :from => 'authorized'
     end
-    # the pay transition is not used by spree for default, just a starting point for offsite payment plugins
-    # like google checkout, and paypal website payments pro.  (no sense in having these types of extensions 
-    # defining possibly conflicting state names)
-    event :pay do
-      transition :to => 'paid', :from => 'pending_payment'
-    end
     event :ship do
       transition :to => 'shipped', :from => 'captured'
-      transition :to => 'shipped', :from => 'paid'
       # todo: also allow from authorized state (but we need to make sure capture is applied first)
     end
     event :cancel do
@@ -115,7 +107,9 @@ class Order < ActiveRecord::Base
   def complete_order
     self.update_attribute(:checkout_complete, true)
     InventoryUnit.sell_units(self)
-    OrderMailer.deliver_confirm(self)
+    if user && user.email
+      OrderMailer.deliver_confirm(self)
+    end
   end
   
   def cancel_order