spree 0.10.2 → 0.11.0

data/CHANGELOG

@@ -1,3 +1,80 @@
+== 0.11.0
+
+* # - 728  ProductsController::change_image method is not in use
+* # - 1170 Support EWay payment gateway (AU)
+* # - 1194 Improve confirmation button text for checkout steps
+* # - 1232 user.has_role? should respect changes to roles and reloads
+* # - 1235 Explicitly define the @orders collection on which to paginate in the admin/orders/index view
+* # - 1236 Improve API for products.
+* # - 1239 Introduce support of Cucumber
+* # - 1256 Add alternative text to product images
+* # - 1259 Admin orders shipping method not saving
+* # - 1266 Ensure CheckoutsController#update uses consistent variable names
+* # - 1268 Allow disabling of inventory level management
+* # - 1277 Add "Use Billing Address" tickbox to admin checkouts
+* # - 1288 Add ruby-openid into gem dependency
+* # - 1290 missing 'show_active' in translation yml
+* # - 1294 undefined method `payment_profiles_supported?' for nil:NilClass
+* # - 1297 Button for applying coupon/discount codes
+* # - 1299 Wrong usage of I18n in dashboard
+* # - 1305 Protx gateway needs updating
+* # - 1307 Do not restrict index action for OrdersController
+* # - 1311 [patch] Making unit tests faster
+* # - 1312 Inline Styles in theme_default/app/views/checkouts/edit.html
+* # - 1313 Taxon rename through admin interface sends wrong new name in ajax request
+* # - 1314 Potential vulnerability after overriding OrdersController actions
+* # - 1318 permalink handling of non-unique strings is broken
+* # - 1321 Address model's checkouts association does not return all checkouts
+* # - 1325 Coupons with lower-case characters fail - With Fix
+* # - 1327 Content controller should have option to skip cacheing
+* # - 1328 Extraneous migration folder with script/generate extension_model
+* # - 1329 Allow admin to delete shipments
+* # - 1331 Sample Data
+* # - 1333 Error in vat calculation
+* # - 1337 Remove white-space from creditcard fields
+* # - 1338 States / Countries info should be returned by API
+* # - 1341 Ensure admin orders are associated to user
+* # - 1343 Failed cucumber features caused by fixing ticket #1194
+* # - 1346 Taxons need Description and Image
+* # - 1352 Bug when Backordering is FALSE and user adds product to cart
+* # - 1354 Rails scripts are not up-to-date
+* # - 1358 Move translations into new extension
+* # - 1361 Wrong translation used to confirm password
+* # - 1365 Allow specifying where payment methods are displayed
+* # - 1374 Shipment API calls are not eagerly loading 
+* # - 1376 Searching for user during admin order can be slow with large datasets
+* # - 1377 Delete shipment does not unassign inventory units
+* # - 1378 Allow adjustments to be added to new admin orders
+* # - 1383 Checkout test fails when anonymous checkout is enabled in an extension
+* # - 1384 [PATCH] Migration that add a description and an icon to taxons created with wrong date
+* # - 1388 Improve performance of admin order search
+* # - 1393 Improve GatewayError logging
+* # - 1394 Inventory can be double counted if order completion fails unexpectedly
+* # - 1399 Order#cancel is not updating shipments
+* # - 1403 Completed orders can be incorrectly reassigned
+* # - 1405 Improved staging environment
+* # - 1406 Improve product search for admin orders
+* # - 1409 Inventory units are not created / destroyed on admin order edit
+* # - 1410 Dates change when searching for orders by date ranges 
+* # - 1412 Document code in app/helpers/admin/base_helper.rb
+* # - 1413 Upgrade to Rails 2.3.8
+* # - 1415 Remove RubyGems deprecation warning workaround
+* # - 1417 Spree could not use AuthLogic 2.1.4
+* # - 1421 Error while deleting an user in admin backend
+* # - 1425 Promote new Rails2.3.6 way for Flash alert and notice
+* # - 1430 Add tags, *.swp and rerun.txt to Gitignore
+* # - 1432 Error when emptying the cart
+* # - 1434 Escape issues with Rails 2.3.8 
+* # - 1435 Remove deprecation warnings caused by rake tasks
+* # - 1436 ruby 1.9.1 i18n wrong argument issue
+* # - 1438 Cucumber tests can fail with RoR 2.3.8
+* # - 1443 Escape issues with breadcrumb
+* # - 1445 Problem when submitting a coupon code
+* # - 1446 Rake task for i18n:sync not work
+* # - 1447 Analytics showing incorrect checkout step
+* # - 1448 Allow setting default tax category for all products via UI
+
+
 == 0.10.2
 
 * # - 1215 Update Vietnamese translation
@@ -26,7 +103,7 @@
 * # - 16	Add Robots.txt file
 * # - 188	Allow admin to create new shipments
 * # - 247	Restrict shipping methods based on order contents
-* # - 301	Limit billing and shipping addres to the same list of countries.
+* # - 301	Limit billing and shipping address to the same list of countries.
 * # - 316	Relation between option_types and product_option_types can break
 * # - 320	Remove all traces of Prototype 
 * # - 361	Drop tlsmail dependency
@@ -43,7 +120,7 @@
 * # - 624	link_to_delete, ajax request missing datatype
 * # - 637	Translation of helpers and confirmation messages
 * # - 638	Property and Prototype specs fails when spree is running in language other than en-US
-* # - 651	Use I18n to display order statuses in combobox.
+* # - 651	Use I18n to display order statuses in com bobox.
 * # - 652	Calls will_paginate helper with wrong attributes.
 * # - 667	jQuery.validate plugin should support internationalization.
 * # - 675	Remove calendar_date_select
@@ -98,7 +175,7 @@
 * # - 851	Guest account email on registration
 * # - 852	Missing  strings  localizations
 * # - 853	Issue with Shipping Address On Multiple Checkouts From Single User
-* # - 858	Integration tests failing becouse of Metal
+* # - 858	Integration tests failing because of Metal
 * # - 860	Checkout can prematurely process creditcard
 * # - 862	Errors when adding item to order are never displayed
 * # - 863	Improve performance of displaying of products.
@@ -196,7 +273,7 @@
 * # - 1162	rake db:load_file, db:load_dir unnecessarily establishes connection (?)
 * # - 1166	City and phone not translated in checkout edit address view
 * # - 1168	Need to recreate reduced BillingIntegration class
-* # - 1171	Local change sudently when browsing into admin overview
+* # - 1171	Local change suddenly when browsing into admin overview
 * # - 1172	Payments admin views should use partials for each payment_method
 * # - 1173	CSS problem with js-validation of address
 * # - 1182	Beanstream Secure Payment profile support

data/CONTRIBUTORS

@@ -20,7 +20,8 @@ Roman Smirnov
 The following people have submitted changes which have been applied to the
 core (in alphabetical order by first name):
 
-Adam Vollrath 
+Adam Vollrath
+Arek Flinik 
 barbecues 
 Ben Marini 
 Bernd Ahlers 
@@ -28,24 +29,29 @@ Bo Frederiksen
 Bobby Santiago 
 Bradley Grzesiak and Nick Karpenske 
 brandon 
-Brian Quinn 
+Brian Quinn
+BrunoGrasselli 
 Bryan Mahoney 
-Caius Durling 
+Caius Durling
+Carlos Lima 
 Chris Gaskett 
 Chris Jones 
 Christopher Maujean 
 Claudio Perez Gamayo 
 Dale Hofkens 
 David Li 
-David North 
+David North
+David Peterson 
 Davor Ocelic 
 Dmitry Shaposhnik 
 dru 
 Edmundo Valle Neto 
 Eliot Sykes 
-Eric Budd 
+Eric Budd
+Eric Pierce 
 Ethan Rowe 
-Fabio Akita 
+Fabio Akita
+Galen Krumel & Joseph Palermo 
 Gregg Pollack 
 Gustavo Gonzalez 
 Hirotaka Mizutani 
@@ -70,7 +76,8 @@ mjwall
 mwestover 
 Nate Murray 
 paul 
-Paul Saieg 
+Paul Saieg
+Patrick Klingemann 
 paulcc 
 Peter Berkenbosch 
 Petri Kivikangas 
@@ -84,7 +91,9 @@ Robert Kuhr
 Roman Smirnov 
 ron 
 Rune Botten 
-Ryan McGeary 
+Ryan McGeary
+Sarah Mei & Zach Brock
+Scott Brooks 
 Scott Jacobsen 
 Sean Schofield 
 Simon Robson 
@@ -99,9 +108,8 @@ tom
 Tomasz Mazur 
 Tony Pelaez 
 Tor Hovland 
-Torsten Rüger 
+Torsten Ruger 
 Trung LE 
-unknown 
 Will Emerson 
 Wynn Netherland 
 yitzhakbg 

data/Rakefile

@@ -24,10 +24,10 @@ begin
     s.rubyforge_project = 'spree'
     s.version = Spree::Version
     s.add_dependency 'rake', '>= 0.7.1'
-    s.add_dependency 'rails', '= 2.3.5'
-    s.add_dependency 'rack', '>= 1.0.1' # only here b/c rails 2.3.5 lamely forgets to require it
+    s.add_dependency 'rails', '= 2.3.8'
+    s.add_dependency 'rack', '>= 1.1.0'
     s.add_dependency 'highline', '= 1.5.1'
-    s.add_dependency 'authlogic', '>=2.1.2'
+    s.add_dependency 'authlogic', '2.1.3'
     s.add_dependency 'authlogic-oid', "1.0.4"
     s.add_dependency 'activemerchant', '= 1.5.1'
     s.add_dependency 'activerecord-tableless', '= 0.1.0'
@@ -39,7 +39,8 @@ begin
     s.add_dependency 'will_paginate', "2.3.11"
     s.add_dependency 'state_machine', "0.8.0"
     s.add_dependency 'faker', "0.3.1"
-    s.add_dependency 'paperclip', "= 2.3.1.1"
+    s.add_dependency 'paperclip', "= 2.3.1.1"    
+    s.add_dependency 'ruby-openid', '>= 2.0.4'
     
     s.has_rdoc = true
     rdoc_excludes = Dir["**"].reject { |f| !File.directory? f }

data/app/controllers/admin/adjustments_controller.rb

@@ -10,15 +10,17 @@ class Admin::AdjustmentsController < Admin::BaseController
   destroy.success.wants.js { render_js_for_destroy }
 
   create.before :set_type
-  create.after :update_totals
+  create.after :update_totals_and_complete_free_order
   update.after :update_totals
   destroy.after :update_totals
 
   private
   def list_adjustment_types
+    applicable_credits = Credit.subclasses.reject{|c| c.to_s == "CouponCredit" }
+    applicable_charges = Charge.subclasses
     @adjustment_types ||= [
-        [ 'Credits', Credit.subclasses.map {|c| c.to_s} ],
-        [ 'Charges', Charge.subclasses.map {|c| c.to_s} ]
+        [ 'Credits', applicable_credits.map {|c| [c.to_s.titleize, c.to_s]} ],
+        [ 'Charges', applicable_charges.map {|c| [c.to_s.titleize, c.to_s]} ]
       ]
   end
 
@@ -29,4 +31,16 @@ class Admin::AdjustmentsController < Admin::BaseController
   def update_totals
     @order.update_totals!
   end
+
+  # Automatically complete and order where no payment is necessary because adjustments cancel out the total
+  def update_totals_and_complete_free_order
+    @order.update_totals!
+    if @order.in_progress? and @order.item_total > 0 and @order.total == 0 and @order.payments.total == 0
+      until @order.checkout.complete?
+        @order.checkout.next!
+      end
+      @order.reload.pay!
+    end
+  end
+
 end

data/app/controllers/admin/base_controller.rb

@@ -12,8 +12,8 @@ class Admin::BaseController < Spree::BaseController
   end
 
   def render_js_for_destroy
-    render :js => "$('.flash.notice').html('#{flash[:notice]}'); $('.flash.notice').show();"
-    flash[:notice] = nil
+    render :js => "$('.flash.notice').html('#{self.notice}'); $('.flash.notice').show();"
+    self.notice = nil
   end
 
   def require_object_editable_by_current_user

data/app/controllers/admin/checkouts_controller.rb

@@ -1,41 +1,50 @@
 class Admin::CheckoutsController  < Admin::BaseController
- resource_controller :singleton
- belongs_to :order
- before_filter :load_data
- ssl_required
+  resource_controller :singleton
+  actions :edit, :update, :show
+  belongs_to :order
+  before_filter :load_data
+  ssl_required
 
- edit.before :edit_before
- update.before :update_before
+  create.flash nil
+  update.flash nil
 
- update.wants.html do
-   if @order.in_progress?
-     redirect_to edit_admin_order_shipment_url(@order, @order.shipment)
-   else
-     redirect_to admin_order_checkout_url(@order)
-   end
- end
+  edit.before :edit_before
+  update.before :update_before
 
- private
- def load_data
-   @countries = Country.find(:all).sort
-   @shipping_countries = Checkout.countries.sort
-   if current_user && current_user.bill_address
-     default_country = current_user.bill_address.country
-   else
-     default_country = Country.find Spree::Config[:default_country_id]
-   end
-   @states = default_country.states.sort
- end
+  update.wants.html do
+    if @order.in_progress?
+      redirect_to edit_admin_order_shipment_url(@order, @order.shipment)
+    else
+      redirect_to admin_order_checkout_url(@order)
+    end
+  end
 
- def edit_before
-   @checkout.build_bill_address(:country_id => Spree::Config[:default_country_id]) if @checkout.bill_address.nil?
-   @checkout.build_ship_address(:country_id => Spree::Config[:default_country_id]) if @checkout.ship_address.nil?
- end
+  private
+  def load_data
+    @countries = Country.find(:all).sort
+    if params[:checkout] && params[:checkout][:bill_address_attributes]
+      default_country = Country.find params[:checkout][:bill_address_attributes][:country_id]
+    elsif params[:checkout] && params[:checkout][:ship_address_attributes]
+      default_country = Country.find params[:checkout][:ship_address_attributes][:country_id]
+    elsif object.bill_address && object.bill_address.country
+      default_country = object.bill_address.country
+    elsif current_user && current_user.bill_address
+      default_country = current_user.bill_address.country
+    else
+      default_country = Country.find Spree::Config[:default_country_id]
+    end
+    @states = default_country.states.sort
+  end
 
- def update_before
-   address = Address.create( params[:checkout][:ship_address_attributes])
-   params[:checkout][:ship_address_attributes][:id] = address.id
-   @checkout.update_attribute(:ship_address_id, address.id)
-   @checkout.shipping_method = @checkout.shipping_methods.first
- end
+  def edit_before
+    @checkout.build_bill_address(:country_id => Spree::Config[:default_country_id]) if @checkout.bill_address.nil?
+    @checkout.build_ship_address(:country_id => Spree::Config[:default_country_id]) if @checkout.ship_address.nil?
+  end
+
+  def update_before
+    @checkout.enable_validation_group(:address)
+
+    #assign order to existing user
+    @checkout.order.update_attribute(:user_id, params[:user_id]) unless params[:user_id].blank?
+  end
 end

data/app/controllers/admin/line_items_controller.rb

@@ -4,9 +4,33 @@ class Admin::LineItemsController < Admin::BaseController
   ssl_required
   actions :all, :except => :index
 
-  before_filter :check_order_contains, :only => :create
+  create.flash nil
+  update.flash nil
+  destroy.flash nil
+
+  #override r_c create action as we want to use order#add_variant instead of creating line_item
+  def create
+    load_object
+    variant = Variant.find(params[:line_item][:variant_id])
+
+    before :create
+
+    @order.add_variant(variant, params[:line_item][:quantity].to_i)
+
+    if @order.save
+      after :create
+      set_flash :create
+      response_for :create
+    else
+      after :create_fails
+      set_flash :create_fails
+      response_for :create_fails
+    end
+
+  end
 
   destroy.success.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false }
+  destroy.failure.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false }
 
   new_action.response do |wants|
     wants.html {render :action => :new, :layout => false}
@@ -16,27 +40,14 @@ class Admin::LineItemsController < Admin::BaseController
     wants.html { render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false}
   end
 
-  update.response do |wants|
-    wants.html { render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false}
-  end
+  update.success.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false}
+  update.failure.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false}
 
   destroy.after :recalulate_totals
   update.after :recalulate_totals
   create.after :recalulate_totals
 
   private
-  def check_order_contains
-    variant = Variant.find(params[:line_item][:variant_id])
-    @order = Order.find_by_number(params[:order_id])
-
-    if @order.contains?(variant)
-      @order.add_variant(variant, params[:line_item][:quantity].to_i)
-      @order.save
-
-      render :partial => "admin/orders/form", :locals => {:order => @order}, :layout => false
-    end
-  end
-
   def recalulate_totals
     unless @order.shipping_method.nil?
       @order.shipping_charges.each do |shipping_charge|
@@ -48,8 +59,11 @@ class Admin::LineItemsController < Admin::BaseController
       tax_charge.update_attributes(:amount => tax_charge.calculate_tax_charge)
     end
 
-    @order.update_totals(true)
-    @order.save
+    @order.checkout.enable_validation_group(@order.checkout.state.to_sym)
+    @order.update_totals!
 
+    unless @order.in_progress?
+      InventoryUnit.adjust_units(@order)
+    end
   end
 end

data/app/controllers/admin/option_types_controller.rb

@@ -16,7 +16,7 @@ class Admin::OptionTypesController < Admin::BaseController
   def remove
     @product.option_types.delete(@option_type)
     @product.save
-    flash[:notice] = I18n.t("notice_messages.option_type_removed")
+    self.notice = I18n.t("notice_messages.option_type_removed")
     redirect_to selected_admin_product_option_types_url(@product)
   end
 

data/app/controllers/admin/orders_controller.rb

@@ -4,12 +4,16 @@ class Admin::OrdersController < Admin::BaseController
   before_filter :initialize_txn_partials
   before_filter :initialize_order_events
   before_filter :load_object, :only => [:fire, :resend, :history]
+  before_filter :ensure_line_items, :only => [:update]
 
-  update.wants.html do
-    if @order.bill_address.nil? || @order.ship_address.nil?
-      redirect_to edit_admin_order_checkout_url(@order)
-    else
-      redirect_to admin_order_url(@order)
+  update do
+    flash nil
+    wants.html do
+      if @order.bill_address.nil? || @order.ship_address.nil?
+        redirect_to edit_admin_order_checkout_url(@order)
+      else
+        redirect_to admin_order_url(@order)
+      end
     end
   end
 
@@ -24,7 +28,7 @@ class Admin::OrdersController < Admin::BaseController
     Order.transaction do
       @order.send("#{event}!")
     end
-    flash[:notice] = t('order_updated')
+    self.notice = t('order_updated')
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
@@ -33,7 +37,7 @@ class Admin::OrdersController < Admin::BaseController
 
   def resend
     OrderMailer.deliver_confirm(@order, true)
-    flash[:notice] = t('order_email_resent')
+    self.notice = t('order_email_resent')
     redirect_to :back
   end
 
@@ -45,6 +49,14 @@ class Admin::OrdersController < Admin::BaseController
   end
 
   def collection
+    if params[:search] && !params[:search][:created_at_after].blank?
+      params[:search][:created_at_after] = Time.zone.parse(params[:search][:created_at_after]).beginning_of_day rescue ""
+    end
+
+    if params[:search] && !params[:search][:created_at_before].blank?
+      params[:search][:created_at_before] = Time.zone.parse(params[:search][:created_at_before]).end_of_day rescue ""
+    end
+
     @search = Order.searchlogic(params[:search])
     @search.order ||= "descend_by_created_at"
 
@@ -71,4 +83,13 @@ class Admin::OrdersController < Admin::BaseController
     @order_events = %w{cancel resume}
   end
 
+  def ensure_line_items
+    load_object
+    if @order.line_items.empty?
+      @order.errors.add(:line_items, t('activerecord.errors.messages.blank'))
+      @order.update_totals
+      render :edit
+    end
+  end
+
 end