spree_core 1.2.0.rc2 → 1.2.0

data/app/views/spree/shared/_products.html.erb

@@ -18,7 +18,7 @@
           <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>
         </div>
         <%= link_to truncate(product.name, :length => 50), product, :class => 'info', :itemprop => "name", :title => product.name %>
-        <span class="price selling" itemprop="price"><%= number_to_currency product.price %></span>
+        <span class="price selling" itemprop="price"><%= product.display_price %></span>
       </li>
     <% end %>
   <% end %>

data/app/views/spree/shipment_mailer/shipped_email.text.erb

@@ -1,15 +1,15 @@
-Dear Customer,
+<%= t('shipment_mailer.shipped_email.dear_customer') %>
 
-Your order has been shipped
+<%= t('shipment_mailer.shipped_email.instructions') %>
 
 ============================================================
-Shipment Summary
+<%= t('shipment_mailer.shipped_email.shipment_summary') %>
 ============================================================
-<% @shipment.line_items.each do |item| %>
+<% @shipment.manifest.each do |item| %>
   <%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant, :include_style => false) %> (<%= item.quantity %>)
 <% end %>
 ============================================================
 
-<%= "Tracking Information: #{@shipment.tracking}" if @shipment.tracking %>
+<%= t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking) if @shipment.tracking %>
 
-Thank you for your business.
+<%= t('shipment_mailer.shipped_email.thanks') %>

data/config/locales/en.yml

@@ -334,11 +334,13 @@ en:
   credit_cards: Credit Cards
   credits: Credits
   current: Current
+  currency: Currency
   customer: Customer
   customer_details: "Customer Details"
   customer_details_updated: "The customer's details have been updated."
   customer_search: "Customer Search"
   date_created: Date created
+  date_completed: Date Completed
   date_range: "Date Range"
   debit: Debit
   default: Default
@@ -357,7 +359,9 @@ en:
   didnt_receive_unlock_instructions: "Didn't receive unlock instructions?"
   discount_amount: "Discount Amount"
   display: Display
+  display_currency: "Display currency"
   dismiss_banner: "No. Thanks! I'm not interested, do not display this message again"
+  dollar_amounts_displayed_as: "Dollar amounts displayed as %{example}"
   edit: Edit
   editing_billing_integration: Editing Billing Integration
   editing_category: "Editing Category"
@@ -606,8 +610,19 @@ en:
   order_mailer:
     confirm_email:
       subject:  "Order Confirmation"
+      dear_customer: "Dear Customer,"
+      instructions: "Please review and retain the following order information for your records."
+      order_summary: "Order Summary"
+      subtotal: "Subtotal:"
+      total: "Order Total:"
+      thanks: "Thank you for your business."
     cancel_email:
       subject: "Cancellation of Order"
+      dear_customer: "Dear Customer,"
+      instructions: "Your order has been CANCELED.  Please retain this cancellation information for your records."
+      order_summary_canceled: "Order Summary [CANCELED]"
+      subtotal: "Subtotal:"
+      total: "Order Total:"
   order_not_in_system: That order number is not valid on this site.
   order_number: Order
   order_operation_authorize: Authorize
@@ -896,6 +911,11 @@ en:
   shipment_mailer:
     shipped_email:
       subject: "Shipment Notification"
+      dear_customer: "Dear Customer,"
+      instructions: "Your order has been shipped"
+      shipment_summary: "Shipment Summary"
+      track_information: "Tracking Information: %{tracking}"
+      thanks: "Thank you for your business."
   shipment_number: "Shipment #"
   shipment_state: Shipment State
   shipment_states:
@@ -929,6 +949,7 @@ en:
   show_incomplete_orders: "Show Incomplete Orders"
   show_only_complete_orders: "Only show complete orders"
   show_out_of_stock_products: "Show out-of-stock products"
+  show_only_unfulfilled_orders: "Show only unfulfilled orders"
   showing_first_n: "Showing first %{n}"
   sign_up: "Sign up"
   site_name: "Site Name"

data/config/routes.rb

@@ -13,7 +13,7 @@ Spree::Core::Engine.routes.draw do
   # non-restful checkout stuff
   put '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
   get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-  get '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout
+  get '/checkout', :to => 'checkout#edit' , :as => :checkout
 
   resources :orders do
     post :populate, :on => :collection

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -11,4 +11,4 @@ Spree.config do |config|
   # config.site_name = "Spree Demo Site"
 end
 
-Spree.user_class = <%= (options[:user_class] || "Spree::LegacyUser").inspect %>
+Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>

data/lib/spree/core.rb

@@ -39,6 +39,7 @@ require 'jquery-rails'
 require 'deface'
 require 'cancan'
 require 'select2-rails'
+require 'spree/money'
 
 module Spree
 

data/lib/spree/core/controller_helpers.rb

@@ -48,6 +48,24 @@ module Spree
         end
       end
 
+      def associate_user
+        if try_spree_current_user && @order
+          if @order.user.blank? || @order.email.blank?
+            @order.associate_user!(try_spree_current_user)
+          end
+        end
+
+        # This will trigger any "first order" promotions to be triggered
+        # Assuming of course that this session variable was set correctly in
+        # the authentication provider's registrations controller
+        if session[:spree_user_signup]
+          fire_event('spree.user.signup', :user => try_spree_current_user, :order => current_order(true))
+        end
+
+        session[:guest_token] = nil
+        session[:spree_user_signup] = nil
+      end
+
       protected
 
       def set_current_order
@@ -89,7 +107,7 @@ module Spree
           format.html do
             if try_spree_current_user
               flash.now[:error] = t(:authorization_failure)
-              render 'spree/shared/unauthorized', :layout => '/spree/layouts/spree_application', :status => 401
+              render 'spree/shared/unauthorized', :layout => Spree::Config[:layout], :status => 401
             else
               store_location
               url = respond_to?(:spree_login_path) ? spree_login_path : root_path

data/lib/spree/core/engine.rb

@@ -10,7 +10,6 @@ module Spree
       config.autoload_paths += %W(#{config.root}/lib)
 
       def self.activate
-        Spree::Order.define_state_machine!
       end
 
       config.to_prepare &method(:activate).to_proc

data/lib/spree/core/search/base.rb

@@ -28,7 +28,7 @@ module Spree
           def get_base_scope
             base_scope = Spree::Product.active
             base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
-            base_scope = get_products_conditions_for(base_scope, keywords) unless keywords.blank?
+            base_scope = get_products_conditions_for(base_scope, keywords)
             base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
             base_scope = add_search_scopes(base_scope)
             base_scope
@@ -48,7 +48,10 @@ module Spree
 
           # method should return new scope based on base_scope
           def get_products_conditions_for(base_scope, query)
-            base_scope.like_any([:name, :description], query.split)
+            unless query.blank?
+              base_scope = base_scope.like_any([:name, :description], query.split)
+            end
+            base_scope
           end
 
           def prepare(params)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.2.0.rc2"
+    "1.2.0"
   end
 end

data/lib/spree/money.rb

@@ -0,0 +1,16 @@
+require 'money'
+
+module Spree
+  class Money
+    def initialize(amount, options={})
+      @money = ::Money.new(amount * 100, Spree::Config[:currency])
+      @options = {}
+      @options[:with_currency] = true if Spree::Config[:display_currency]
+      @options.merge!(options)
+    end
+
+    def to_s
+      @money.format(@options)
+    end
+  end
+end

data/lib/spree/product_filters.rb

@@ -46,9 +46,6 @@ module Spree
   # happen until Taxon class is loaded. Ensure that Taxon class is loaded before
   # you try something like Product.price_range_any
   module ProductFilters
-    extend ActionView::Helpers::NumberHelper
-    extend Spree::BaseHelper
-
     # Example: filtering by price
     #   The named scope just maps incoming labels onto their conditions, and builds the conjunction
     #   'price' is in the base scope's context (ie, "select foo from products where ...") so
@@ -67,6 +64,10 @@ module Spree
       Spree::Product.joins(:master).where(scope)
     end
 
+    def ProductFilters.format_price(amount)
+      Spree::Money.new(amount)
+    end
+
     def ProductFilters.price_filter
       v = Spree::Variant.arel_table
       conds = [ [ I18n.t(:under_price, :price => format_price(10))   , v[:price].lteq(10)],

metadata

@@ -1,115 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
-  prerelease: 6
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195843340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+  version_requirements: *70333195843340
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195842800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
+  version_requirements: *70333195842800
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195842040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+  version_requirements: *70333195842040
 - !ruby/object:Gem::Dependency
   name: select2-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195841300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+  version_requirements: *70333195841300
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.11
+  version_requirements: *70333195840660
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195839980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
+  version_requirements: *70333195839980
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195839260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.12.0
+  version_requirements: *70333195839260
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195838560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
+  version_requirements: *70333195838560
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195837920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,47 +109,32 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+  version_requirements: *70333195837920
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195837300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+  version_requirements: *70333195837300
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195836600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: 1.28.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.20.4
+  version_requirements: *70333195836600
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195835840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +142,10 @@ dependencies:
         version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
+  version_requirements: *70333195835840
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195835140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,15 +153,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.13.0
+  version_requirements: *70333195835140
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195834460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -229,15 +164,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+  version_requirements: *70333195834460
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195833680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -245,28 +175,29 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
+  version_requirements: *70333195833680
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70333195698220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70333195698220
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: &70333195697580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70333195697580
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -381,6 +312,7 @@ files:
 - app/assets/images/icons/checkout.png
 - app/assets/images/icons/delete.png
 - app/assets/images/icons/update.png
+- app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
 - app/assets/images/noimage/product.png
 - app/assets/images/noimage/small.png
@@ -400,11 +332,11 @@ files:
 - app/assets/javascripts/admin/orders/edit_form.js
 - app/assets/javascripts/admin/payments/new.js
 - app/assets/javascripts/admin/product_autocomplete.js.erb
-- app/assets/javascripts/admin/shipping_methods.js
+- app/assets/javascripts/admin/shipping_methods.js.coffee
 - app/assets/javascripts/admin/spree_core.js
 - app/assets/javascripts/admin/taxonomy.js
 - app/assets/javascripts/admin/underscore-min.js
-- app/assets/javascripts/admin/zone.js
+- app/assets/javascripts/admin/zone.js.coffee
 - app/assets/javascripts/store/cart.js.coffee
 - app/assets/javascripts/store/checkout.js.coffee
 - app/assets/javascripts/store/product.js.coffee
@@ -469,6 +401,7 @@ files:
 - app/controllers/spree/taxons_controller.rb
 - app/helpers/spree/account_helper.rb
 - app/helpers/spree/admin/base_helper.rb
+- app/helpers/spree/admin/general_settings_helper.rb
 - app/helpers/spree/admin/inventory_settings_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
 - app/helpers/spree/admin/orders_helper.rb
@@ -599,7 +532,6 @@ files:
 - app/views/spree/admin/payments/_bill_address_form.html.erb
 - app/views/spree/admin/payments/_form.html.erb
 - app/views/spree/admin/payments/_list.html.erb
-- app/views/spree/admin/payments/_transaction_list.html.erb
 - app/views/spree/admin/payments/credit.html.erb
 - app/views/spree/admin/payments/index.html.erb
 - app/views/spree/admin/payments/new.html.erb
@@ -805,7 +737,6 @@ files:
 - lib/spree/core/middleware/seo_assist.rb
 - lib/spree/core/permalinks.rb
 - lib/spree/core/preference_rescue.rb
-- lib/spree/core/relation_serialization.rb
 - lib/spree/core/respond_with.rb
 - lib/spree/core/responder.rb
 - lib/spree/core/s3_support.rb
@@ -857,6 +788,7 @@ files:
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
 - lib/spree/core.rb
+- lib/spree/money.rb
 - lib/spree/product_filters.rb
 - lib/spree/scopes/dynamic.rb
 - lib/spree_core.rb
@@ -1065,13 +997,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3303214660829920251
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.