spree 0.8.5 → 0.9.0

data/CHANGELOG

@@ -1,15 +1,108 @@
+== 0.9.0
+
+* # - 137	Products without variants can't have a weight.
+* # - 143	Load initializers from extensions
+* # - 217	Remove Paperclip messages from log
+* # - 285	Problem with spree command in older versions of Ruby Gems. 
+* # - 477	Refactor checkout into its own model, view and controller
+* # - 480	Error when browsing to an invalid taxon
+* # - 488	Can't add new product with cyrrilic symbols in Name
+* # - 496	Record checkout completion timestamp
+* # - 498	Additional Translation Strings
+* # - 499	Refactor order totaling to use a system of charges
+* # - 502	Image upload not working....
+* # - 504	Handling requests for products/taxons not in the db
+* # - 508	Spree admin does not render well in IE
+* # - 518	SKU disappears when variants are added.
+* # - 519	Upgrade to newer version of compass
+* # - 521	Cannot checkout using IE6
+* # - 525	Latest master checkout resulted in migrations failing
+* # - 526	Tests failing with Russian and French locales
+* # - 531	Spree should not require exact haml-edge version
+* # - 532	Hebrew translation
+* # - 533	Thai localization
+* # - 536	Possible issue with i18n:sync
+* # - 543	Migration failure on newer versions of Postgres
+* # - 544	Improve efficient for product display
+* # - 545	Refactor order totaling to use a system of credits
+* # - 546	Allow configuration for automatic capture
+* # - 549	Spree is overwritting :per_page parameter
+* # - 557	Need to avoid silent failures in the checkout process
+* # - 558	Remove admin user check from products controller
+* # - 560	Allow admin view to display a customized order display
+* # - 561	Upgrade the vendored version of Paperclip?
+* # - 562	Removed favicon.ico file?
+* # - 564	Losses of confirmation emails for registered users
+* # - 565	Need access to image width and height
+* # - 567	Credit card type guessing in checkout has been disconnected
+* # - 569	Reduce application layout duplication
+* # - 572	Repeated saves of CC objects leaves XXXX-XXXX-XXXX- in display_number field
+* # - 577	Add Dutch translation files
+* # - 578	Support coupons and discounts
+* # - 579	Allow calculator configuration (shipping, coupons, etc.) via admin interface
+* # - 581	Password reset mails should come from the "generic" address
+* # - 582	Allow login bar to be called via https
+* # - 585	Support for variant images
+* # - 587	Upgrading to the new version of searchlogic
+* # - 589	Update locale translations
+* # - 590	Fixed confusing error message in UsersController
+* # - 593	InventoryUnit does not associate with an order when sold
+* # - 600	An alternative to spree:upgrade?
+* # - 601	Finnish localization
+* # - 603	Don't show restricted administrator tabs
+* # - 604	Several not translated strings
+* # - 605	update totals after removing line items
+* # - 606	Avoid clobbering formbuilder in product forms
+* # - 613	Rails 2.3.4 Compatibility
+* # - 615	Add Mexican Spanish localization files
+* # - 616	Protect cart for mass_assignement
+* # - 621	Provide type aware preference helper
+* # - 622	Sample users are not added to the 'user' role
+* # - 626	rake spree:upgrade doesn't delete initializers/searchlogic.rb
+* # - 627	Add some named scopes for common filtering operations
+* # - 629	Incomplete usage help text for script/generate extension_migration
+* # - 630	zone_members.yml contains unknown zone ids
+* # - 635	Mail templates have hard-coded $
+* # - 636	Bug when canceling/resuming orders with language other than en-US
+* # - 639	Jquery checkout bug
+* # - 645	state changesin order don't produce SteteEvents
+* # - 646	address model spec failing on missing state test
+* # - 649	Order summary partial don't supports I18n.
+* # - 650	Improvement to route upgrade process
+* # - 654	en_GB_rails is broken - fails to load up some translations
+* # - 655	Quantity field does not update in orders/edit
+* # - 660	addresses in checkout should default to the ones the customer last used
+* # - 661	Checkout address forms don't show state_name for state-less countries
+* # - 663	Show selected Variant image in cart
+* # - 668	Add support for faceted search / filtering
+* # - 674	Testing of orders is slow (and will fail around 1 time in 259)
+* # - 681	Improvements for zone handling
+* # - 682	Improve seeding code
+* # - 691	SMTP error during checkout prevents order from being properly completed
+* # - 693	Error on deploy edge version
+* # - 697	Rails Metal is not loaded properly
+* # - 698	LineItem validation needs more care with checking of stock levels
+* # - 709	update_addresses not defined in checkout.js
+* # - 718	Don't work sorting orders by email.
+* # - 720	Improve messages for require_{no_}user
+* # - 722	Unknown object case doesn't handle case where id parameter is empty
+* # - 723	Modify percentage calculator to use percentages
+* # - 726	product.variants contains deleted variants
+* # - 733	reject_unknown_object fails for collections
+* # - 736	Column deleted_at can be ambiguous in some cases.
+
 == 0.8.5
 
+Same as 0.8.4 (problem with release in 0.8.4)
+
+== 0.8.4
+
 * # 494 - There are no default states for United states when you don't load sample data
 * # 551 - Remove bootstrap restriction in production mode
 * # 553 - Allow creation of default user through web interface
 * # 550 - Seed data no longer populated correctly
 * # 552 - Allow db:admin:create rake task to be run more then once
 
-== 0.8.4
-
-* No substantive changes.
-
 == 0.8.3
 
 * # 450 - Rake tasks failing if rspec is not installed on the system

data/CONTRIBUTORS

@@ -9,43 +9,76 @@ in March 2008 in order to avoid any confusion about it being endorsed by the Rub
 The following people have submitted changes which have been applied to the
 core:
 
-Ben Marini
 Bernd Ahlers
-Bobby Santiago
-Brian Quinn
+Fabio Akita
+Peter Berkenbosch
+Eric Budd
+Ramon Cahenzli
+Jorge Calás
+Paul Callaghan
+Sonny Cook
+Joren De Groof
+Yves Dufour
 Caius Durling
+Will Emerson
+Maxim Filatov
+Bo Frederiksen
 Chris Gaskett
+Gustavo Gonzalez
 Dale Hofkens
-Edmundo Valle Neto
-Eric Budd
-Fabio Akita
-Gregg Pollack
-Jason Seifer
+Tor Hovland
 Jon Jensen
-Jorge Calás Lozano
-Joshua Nussbaum
-Manuel Stuefer
-Nate Murray
-Paul Saieg
-Peter Berkenbosch
-Ricardo Shiota Yasuda
+Petri Kivikangas
 Robert Kuhr
-Sean Schofield
-Sonny Cook
-Stephanie Powell
+Michael Lang
+Bryan Mahoney
+Ben Marini
+Christopher Maujean
 Tomasz Mazur
-Tor Hovland
-Will Emerson
+Ryan McGeary
+Hirotaka Mizutani
+Nate Murray
 Wynn Netherland
-Yves Dufour
-mjwall
-mwestover
-Paul Callaghan
-pierre
-ron
-spariev
-tom
-yitzhakbg
+David North
+Joshua Nussbaum
+Tony Pelaez
+Claudio Perez Gamayo
+Michael Pirogov
+Gregg Pollack
+Stephanie Powell
+Brian Quinn
+Marcin Raczkowski
+Melvin Ram
+Simon Robson
+Ethan Rowe
+Paul Saieg
+Bobby Santiago
+Sean Schofield
+Jeff Seibert
+Jason Seifer
+Dmitry Shaposhnik
+Ricardo Shiota Yasuda
+Roman Smirnov
+Manuel Stuefer
+Eliot Sykes
+Michael Torfs
+Jonathan Tron
+Edmundo Valle Neto
+Adam Vollrath
+spariev 
+pierre 
+ran 
+mjwall 
+paul 
+max 
+ran 
+barbecues 
+ron 
+mwestover 
+yitzhakbg 
+brandon 
+tom 
+dru
 
 == Legacy Contributors
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2008, Schofield Tech Works LLC and other contributors
+Copyright (c) 2007-2009, Rails Dog LLC and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/README.markdown

@@ -13,7 +13,7 @@ Running from sources (latest and greatest features)
 
 1. Clone the git repo
 
-        git clone git://github.com/schof/spree.git spree
+        git clone git://github.com/railsdog/spree.git spree
 
 2. Create the necessary config/database.yml file
         

data/app/controllers/admin/base_controller.rb

@@ -1,12 +1,21 @@
 class Admin::BaseController < Spree::BaseController
   helper :search
   layout 'admin'
-  
+
   before_filter :initialize_product_admin_tabs
   before_filter :initialize_order_admin_tabs
+  before_filter :initialize_extension_tabs
   before_filter :add_shipments_tab
 
 private
+  def add_extension_admin_tab(tab_args)
+    @extension_tabs << tab_args
+  end
+
+  def initialize_extension_tabs
+    @extension_tabs = []
+  end
+
   def add_shipments_tab
     @order_admin_tabs << {:name => 'Shipments', :url => "admin_order_shipments_url"}
   end

data/app/controllers/admin/configurations_controller.rb

@@ -1,16 +1,27 @@
 class Admin::ConfigurationsController < Admin::BaseController
-
   before_filter :initialize_extension_links, :only => :index
-  before_filter :add_shipping_links, :only => :index
+  
+  class << self
+    def add_link(text, path, description)
+      unless @@extension_links.any?{|link| link[:link_text] == text}
+        @@extension_links << {
+          :link => path,
+          :link_text => text,
+          :description => description,
+        }
+      end
+    end
+  end
 
   protected
 
-  def add_shipping_links
-    @extension_links << {:link => admin_shipping_methods_path, :link_text => t("shipping_methods"), :description => t("shipping_methods_description")}
-    @extension_links << {:link => admin_shipping_categories_path, :link_text => t("shipping_categories"), :description => t("shipping_categories_description")}
-  end
-
   def initialize_extension_links
-    @extension_links = []
+    @extension_links = [
+      {:link => admin_shipping_methods_path, :link_text => t("shipping_methods"), :description => t("shipping_methods_description")},
+      {:link => admin_shipping_categories_path, :link_text => t("shipping_categories"), :description => t("shipping_categories_description")},
+      {:link => admin_shipping_rates_path, :link_text => t("shipping_rates"), :description => t("shipping_rates_description")},
+    ] + @@extension_links
   end
+
+  @@extension_links = []
 end

data/app/controllers/admin/coupons_controller.rb

@@ -0,0 +1,17 @@
+class Admin::CouponsController < Admin::BaseController
+  resource_controller         
+  before_filter :load_data
+
+  update.wants.html { redirect_to edit_object_url }
+  create.wants.html { redirect_to edit_object_url }
+
+  private       
+  def build_object
+    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params 
+    @object.calculator = params[:coupon][:calculator_type].constantize.new if params[:coupon]
+  end
+  
+  def load_data     
+    @calculators = Coupon.calculators
+  end  
+end

data/app/controllers/admin/creditcard_payments_controller.rb

@@ -14,14 +14,10 @@ class Admin::CreditcardPaymentsController < Admin::BaseController
          
   def capture       
     if @creditcard_payment.can_capture?      
-      creditcard = @creditcard_payment.creditcard
-      authorization = @creditcard_payment.find_authorization
-      Creditcard.transaction do 
-        creditcard.order.state_events.create(:name => t('pay'), :user => current_user, :previous_state => creditcard.order.state)
-        creditcard.capture(authorization)
-        @creditcard_payment.amount = authorization.amount
-        @creditcard_payment.save
-      end
+      #Creditcard.transaction do
+      #  @order.state_events.create(:name => t('pay'), :user => current_user, :previous_state => order.state)
+        @creditcard_payment.capture#(authorization)
+      #end
       flash[:notice] = t("credit_card_capture_complete")
     else  
       flash[:error] = t("unable_to_capture_credit_card")    

data/app/controllers/admin/images_controller.rb

@@ -1,15 +1,54 @@
 class Admin::ImagesController < Admin::BaseController
   resource_controller
-  actions :destroy
+  before_filter :load_data
+	
+	new_action.response do |wants|
+    wants.html {render :action => :new, :layout => false}
+  end
+
+	create.response do |wants|
+		wants.html {redirect_to admin_product_images_url(@product)}
+  end
 
+	update.response do |wants|
+		wants.html {redirect_to admin_product_images_url(@product)}
+  end
+	
+	create.before do
+		if params[:image].has_key? :viewable_id
+			if params[:image][:viewable_id] == "All"
+				object.viewable_type = 'Product'
+				object.viewable_id = @product.id
+			else
+				object.viewable_type = 'Variant'
+				object.viewable_id = params[:image][:viewable_id]
+			end
+		else
+			object.viewable_type = 'Product'
+			object.viewable_id = @product.id
+		end
+	end
+	
   destroy.before do 
     @viewable = object.viewable
   end
   
   destroy.response do |wants| 
     wants.html do
-      flash[:notice] = nil
-      render :partial => '/admin/products/images', :locals => {:viewable => @viewable}
+			render :text => ""
     end
   end
+ 
+  private
+
+  def load_data
+		@product = Product.find_by_permalink(params[:product_id])
+		@variants = @product.variants.collect do |variant| 
+			[variant.options_text, variant.id ]
+		end
+		
+		@variants.insert(0, "All")
+  end
+
+
 end

data/app/controllers/admin/orders_controller.rb

@@ -12,7 +12,6 @@ class Admin::OrdersController < Admin::BaseController
     # itself will make sure transitions are not applied in the wrong state)
     event = params[:e]
     Order.transaction do 
-      @order.state_events.create(:name => t(event), :user => current_user, :previous_state => @order.state)
       @order.send("#{event}!")
     end
     flash[:notice] = t('order_updated')
@@ -31,19 +30,20 @@ class Admin::OrdersController < Admin::BaseController
   private
 
   def collection
-    @search = Order.new_search(params[:search])
+    @search = Order.search(params[:search])
+    @search.order ||= "descend_by_created_at"
 
-    if params[:search].nil? || params[:search][:conditions].nil?
-      @search.conditions.checkout_complete = true
-    end
-
-    #set order by to default or form result
-    @search.order_by ||= :created_at
-    @search.order_as ||= "DESC"
-    #set results per page to default or form result
-    @search.per_page = Spree::Config[:orders_per_page]
+    # QUERY - get per_page from form ever???  maybe push into model
+    # @search.per_page ||= Spree::Config[:orders_per_page]
 
-    @collection = @search.find(:all, :include => [:user, :shipments, {:creditcards => :address}] )
+    # turn on show-complete filter by default
+    unless params[:search] && params[:search][:checkout_completed_at_not_null]
+      @search.checkout_completed_at_not_null = true 
+    end
+    
+    @collection = @search.paginate(:include  => [:user, :shipments, {:creditcard_payments => {:creditcard => :address}}],
+                                   :per_page => Spree::Config[:orders_per_page], 
+                                   :page     => params[:page])
   end
 
   # Allows extensions to add new forms of payment to provide their own display of transactions

data/app/controllers/admin/products_controller.rb

@@ -1,7 +1,6 @@
 class Admin::ProductsController < Admin::BaseController
   resource_controller
   before_filter :load_data
-  after_filter :set_image, :only => [:create, :update]
 
   # set the default tax_category if applicable
   new_action.before do
@@ -56,41 +55,22 @@ class Admin::ProductsController < Admin::BaseController
       @tax_categories = TaxCategory.find(:all, :order=>"name")  
       @shipping_categories = ShippingCategory.find(:all, :order=>"name")  
     end
-
-    def set_image
-      return unless params[:image]
-      return if params[:image][:attachment].blank?    
-      image = Image.create params[:image] if params[:image]
-      object.images << image
-    end
     
     def collection
-      
-      #use the active named scope only if the 'show deleted' checkbox is unchecked
-      if params[:search].nil? || params[:search][:conditions].nil? || params[:search][:conditions][:deleted_at_is_not_null].blank?
-        @search = end_of_association_chain.not_deleted.new_search(params[:search])
-      else
-        @search = end_of_association_chain.new_search(params[:search])
+      base_scope = end_of_association_chain
+
+      # Note: the SL scopes are on/off switches, so we need to select "not_deleted" explicitly if the switch is off
+      # QUERY - better as named scope or as SL scope?
+      if params[:search].nil? || params[:search][:deleted_at_not_null].blank?
+        base_scope = base_scope.not_deleted
       end
 
-      #set order by to default or form result
-      @search.order_by ||= :name
-      @search.order_as ||= "ASC"
-      #set results per page to default or form result
-      @search.per_page = Spree::Config[:admin_products_per_page]
-      @search.include = :images
-      @collection = @search.all
-    end
+      @search = base_scope.search(params[:search])
+      @search.order ||= "ascend_by_name"
 
-    # override rc_default build b/c we need to make sure there's an empty variant added to each product
-    def build_object
-      @object ||= Product.new params[:product]      
-      if @object.variants.empty?
-        @object.available_on = Time.now
-        @object.variants << Variant.new(:product => @object)
-      end
-      @object.variant.sku = params[:product] ? params[:product][:sku] : ""
-      @object
-    end   
+      @collection = @search.paginate(:include  => {:variants => :images},
+                                     :per_page => Spree::Config[:admin_products_per_page], 
+                                     :page     => params[:page])
+    end
   
 end