spree_core 1.3.0.rc1 → 1.3.0.rc2

data/app/models/spree/calculator/per_item.rb

@@ -34,7 +34,9 @@ module Spree
       # Shipping methods do not have promotions attached, but promotions do
       # Therefore we must check for promotions
       if self.calculable.respond_to?(:promotion)
-        self.calculable.promotion.rules.map(&:products).flatten
+        self.calculable.promotion.rules.map do |rule|
+          rule.respond_to?(:products) ? rule.products : []
+        end.flatten
       end
     end
   end

data/app/models/spree/line_item.rb

@@ -100,7 +100,7 @@ module Spree
 
       def ensure_not_shipped
         if order.try(:inventory_units).to_a.any?{ |unit| unit.variant_id == variant_id && unit.shipped? }
-          errors.add :base, I18n.t('validation.cannot_destory_line_item_as_inventory_units_have_shipped')
+          errors.add :base, I18n.t('validation.cannot_destroy_line_item_as_inventory_units_have_shipped')
           return false
         end
       end
@@ -108,7 +108,7 @@ module Spree
       # Validation
       def stock_availability
         return if sufficient_stock?
-        errors.add(:quantity, I18n.t('validation.cannot_be_greater_than_available_stock'))
+        errors.add(:quantity, I18n.t('validation.exceeds_available_stock'))
       end
 
       def quantity_no_less_than_shipped

data/app/models/spree/order/checkout.rb

@@ -126,7 +126,10 @@ module Spree
               end
               checkout_steps << step
             end
-            checkout_steps.map(&:to_s)
+            steps = checkout_steps.map(&:to_s)
+            # Ensure there is always a complete step
+            steps << "complete" unless steps.include?("complete")
+            steps
           end
         end
       end

data/app/models/spree/order.rb

@@ -24,7 +24,7 @@ module Spree
         order.payment_required?
       }
       go_to_state :confirm, :if => lambda { |order| order.confirmation_required? }
-      go_to_state :complete, :if => lambda { |order| (order.payment_required? && order.paid?) || !order.payment_required? }
+      go_to_state :complete, :if => lambda { |order| (order.payment_required? && order.payments.exists?) || !order.payment_required? }
       remove_transition :from => :delivery, :to => :confirm
     end
 
@@ -355,6 +355,10 @@ module Spree
       end
     end
 
+    def can_ship?
+      self.complete? || self.resumed?
+    end
+
     def credit_cards
       credit_card_ids = payments.from_credit_card.map(&:source_id).uniq
       CreditCard.scoped(:conditions => { :id => credit_card_ids })

data/app/models/spree/payment/processing.rb

@@ -110,7 +110,7 @@ module Spree
     def gateway_options
       options = { :email    => order.email,
                   :customer => order.email,
-                  :ip       => '192.168.1.100', # TODO: Use an actual IP
+                  :ip       => order.last_ip_address,
                   :order_id => order.number }
 
       options.merge!({ :shipping => order.ship_total * 100,

data/app/models/spree/preferences/preferable_class_methods.rb

@@ -10,16 +10,13 @@ module Spree::Preferences
       # cache_key will be nil for new objects, then if we check if there
       # is a pending preference before going to default
       define_method preference_getter_method(name) do
-        if preference_cache_key(name) && preference_store.exist?(preference_cache_key(name))
-          preference_store.get preference_cache_key(name)
+
+        # perference_cache_key will only be nil/false for new records
+        #
+        if preference_cache_key(name)
+          preference_store.get(preference_cache_key(name), default)
         else
-          if get_pending_preference(name)
-            get_pending_preference(name)
-          elsif Spree::Preference.table_exists? && preference = Spree::Preference.find_by_key(name.to_s)
-            preference.value
-          else
-            send self.class.preference_default_getter_method(name)
-          end
+          get_pending_preference(name) || default
         end
       end
       alias_method prefers_getter_method(name), preference_getter_method(name)

data/app/models/spree/preferences/store.rb

@@ -27,25 +27,36 @@ module Spree::Preferences
       should_persist? && Spree::Preference.where(:key => key).exists?
     end
 
-    def get(key)
+    def get(key,fallback=nil)
       # return the retrieved value, if it's in the cache
-      if (val = @cache.read(key)).present?
+      # use unless nil? incase the value is actually boolean false
+      #
+      unless (val = @cache.read(key)).nil?
         return val
       end
 
-      return nil unless should_persist?
+      if should_persist?
+        # If it's not in the cache, maybe it's in the database, but
+        # has been cleared from the cache
 
-      # If it's not in the cache, maybe it's in the database, but
-      # has been cleared from the cache
+        # does it exist in the database?
+        if Spree::Preference.table_exists? && preference = Spree::Preference.find_by_key(key)
+          # it does exist, so let's put it back into the cache
+          @cache.write(preference.key, preference.value)
 
-      # does it exist in the database?
-      if preference = Spree::Preference.find_by_key(key)
-        # it does exist, so let's put it back into the cache
-        @cache.write(preference.key, preference.value)
+          # and return the value
+          return preference.value
+        end
+      end
 
-        # and return the value
-        preference.value
+      unless fallback.nil?
+        # cache fallback so we won't hit the db above on
+        # subsequent queries for the same key
+        #
+        @cache.write(key, fallback)
       end
+
+      return fallback
     end
 
     def delete(key)

data/app/models/spree/product/scopes.rb

@@ -189,7 +189,11 @@ module Spree
 
     # Can't use add_search_scope for this as it needs a default argument
     def self.available(available_on = nil, currency = nil)
-      joins(:master => :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.now).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
+      scope = joins(:master => :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.now)
+      unless Spree::Config.show_products_without_price
+        scope = scope.where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
+      end
+      scope
     end
     search_scopes << :available
 

data/app/models/spree/shipment.rb

@@ -28,7 +28,7 @@ module Spree
 
     scope :with_state, lambda { |s| where(:state => s) }
     scope :shipped, with_state('shipped')
-    scope :ready,   with_state('ready')
+    scope :ready, with_state('ready')
     scope :pending, with_state('pending')
 
     def to_param
@@ -51,11 +51,13 @@ module Spree
     def cost
       adjustment ? adjustment.amount : 0
     end
+
     alias_method :amount, :cost
 
     def display_cost
       Spree::Money.new(cost, { :currency => currency })
     end
+
     alias_method :display_amount, :display_cost
 
     # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
@@ -110,7 +112,7 @@ module Spree
     # shipped    if already shipped (ie. does not change the state)
     # ready      all other cases
     def determine_state(order)
-      return 'pending' unless order.complete?
+      return 'pending' unless order.can_ship?
       return 'pending' if inventory_units.any? &:backordered?
       return 'shipped' if state == 'shipped'
       order.paid? ? 'ready' : 'pending'
@@ -121,7 +123,7 @@ module Spree
         return number unless number.blank?
         record = true
         while record
-          random = "H#{Array.new(11){rand(9)}.join}"
+          random = "H#{Array.new(11) { rand(9) }.join}"
           record = self.class.where(:number => random).first
         end
         self.number = random
@@ -158,9 +160,10 @@ module Spree
       def ensure_correct_adjustment
         if adjustment
           adjustment.originator = shipping_method
+          adjustment.label = shipping_method.adjustment_label
           adjustment.save
         else
-          shipping_method.create_adjustment(I18n.t(:shipping), order, self, true)
+          shipping_method.create_adjustment(shipping_method.adjustment_label, order, self, true)
           reload #ensure adjustment is present on later saves
         end
       end

data/app/models/spree/shipping_method.rb

@@ -15,6 +15,10 @@ module Spree
 
     calculated_adjustments
 
+    def adjustment_label
+      I18n.t(:shipping)
+    end
+
     def available?(order, display_on = nil)
       displayable?(display_on) && calculator.available?(order)
     end

data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb

@@ -0,0 +1,19 @@
+<script type='text/template' id='customer_autocomplete_template'>
+  <div class='customer-autocomplete-item'>
+    <div class='customer-details'>
+      <h5>{{customer.email}}</h5>
+      {{#if bill_address.firstname }}
+        <strong>{{t 'bill_address' }}</strong>
+        {{bill_address.firstname}} {{bill_address.lastname}}<br>
+        {{bill_address.address1}}, {{bill_address.address2}}<br>
+        {{bill_address.city}}<br>
+        {{#if bill_address.state_id }}
+          {{bill_address.state.name}}
+        {{else}}
+          {{bill_address.state_name}}
+        {{/if}}
+        {{bill_address.country.name}}
+      {{/if}}
+    </div>
+  </div>
+</script>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -11,15 +11,16 @@
 <% end %>
 
 <% if @order.cart? %>
-  <div id="add-line-item" data-hook>
+  <div id="select-customer" data-hook>
     <fieldset class="no-border-bottom">
       <legend align="center"><%= t(:customer_search) %></legend>
-      <%= label_tag :customer_search, t(:enter_at_least_five_letters) %>
-      <%= text_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
+      <%= hidden_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
+      <%= render :partial => "spree/admin/orders/customer_details/autocomplete", :formats => :js %>
     </fieldset>
   </div>
 <% end %>
 
+
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 
 <%= form_for @order, :url => admin_order_customer_url(@order) do |f| %>

data/app/views/spree/admin/orders/edit.html.erb

@@ -1,7 +1,7 @@
 <%= csrf_meta_tags %>
 <% content_for :page_actions do %>
   <li><%= event_links %></li>
-  <li><%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email' if @order.user %></li>
+  <li><%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email' %></li>
   <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 

data/app/views/spree/admin/products/search.rabl

@@ -0,0 +1,6 @@
+collection @products
+attributes :sku, :name, :id 
+
+child(:variant_images => :images) do
+  attributes :mini_url
+end

data/app/views/spree/admin/search/users.rabl

@@ -1,32 +1,30 @@
-object false
-child @users => :users do
-  attributes :email, :id
-  address_fields = [:firstname, :lastname,
-                    :address1, :address2,
-                    :city, :zipcode,
-                    :phone, :state_name,
-                    :state_id, :country_id,
-                    :company]
+collection(@users)
+attributes :email, :id
+address_fields = [:firstname, :lastname,
+                  :address1, :address2,
+                  :city, :zipcode,
+                  :phone, :state_name,
+                  :state_id, :country_id,
+                  :company]
 
-  child :ship_address => :ship_address do
-    attributes *address_fields
-    child :state do
-      attributes :name
-    end
+child :ship_address => :ship_address do
+  attributes *address_fields
+  child :state do
+    attributes :name
+  end
 
-    child :country do
-      attributes :name
-    end
+  child :country do
+    attributes :name
   end
+end
 
-  child :bill_address => :bill_address do
-    attributes *address_fields
-    child :state do
-      attributes :name
-    end
+child :bill_address => :bill_address do
+  attributes *address_fields
+  child :state do
+    attributes :name
+  end
 
-    child :country do
-      attributes :name
-    end
+  child :country do
+    attributes :name
   end
 end

data/app/views/spree/admin/shared/_head.html.erb

@@ -8,7 +8,7 @@
 </title>
 
 <!-- Get "Open Sans" font from Google -->
-<link href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
+<link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
 
 <%= stylesheet_link_tag 'admin/all' %>
 

data/app/views/spree/admin/shared/_routes.html.erb

@@ -1,7 +1,8 @@
 <script>
   Spree.routes = <%== {
     :variants_search       => spree.admin_search_variants_path(:format => 'json'),
-    :taxon_search         => spree.search_admin_taxons_path(:format => 'json'),
-    :user_search          => spree.admin_search_users_path(:format => 'json')
+    :taxon_search          => spree.search_admin_taxons_path(:format => 'json'),
+    :user_search           => spree.admin_search_users_path(:format => 'json'),
+    :product_search        => spree.search_admin_products_path(:format => 'json')
   }.to_json %>;
 </script>

data/app/views/spree/admin/shared/_translations.html.erb

@@ -6,6 +6,8 @@
     :abbr_day_names      => I18n.t(:abbr_day_names, :scope => :date),
     :add                 => I18n.t(:add),
     :are_you_sure_delete => I18n.t(:are_you_sure_delete),
+    :bill_address        => I18n.t(:bill_address),
+    :choose_a_customer   => I18n.t(:choose_a_customer),
     :confirm_delete      => I18n.t(:confirm_delete),
     :cut                 => I18n.t(:cut),
     :destroy             => I18n.t(:destroy),
@@ -24,6 +26,7 @@
     :searching           => I18n.t(:searching),
     :sku                 => I18n.t(:sku),
     :type_to_search      => I18n.t(:type_to_search),
+    :taxon_placeholder   => I18n.t(:taxon_placeholder),
     :value               => I18n.t(:value)
   }.to_json
 %>

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -24,7 +24,7 @@
   </div>
 </div>
 
-<div data-hook"admin_shipping_method_form_availability_fields" class="alpha six columns">
+<div data-hook="admin_shipping_method_form_availability_fields" class="alpha six columns">
   <fieldset class="categories no-border-bottom">
     <legend align="center"><%= t(:availability) %></legend>
 

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -13,8 +13,8 @@
       <h6 class="variant-name">{{variant.name}}</h6>
 
       <ul class='variant-data'>
-        <li class='variant-sku'><strong>{{translations.sku}}:</strong> {{variant.sku}}</li>
-        <li class='variant-on_hand'><strong>{{translations.on_hand}}:</strong> {{variant.count_on_hand}}</li>
+        <li class='variant-sku'><strong>{{t 'sku'}}:</strong> {{variant.sku}}</li>
+        <li class='variant-on_hand'><strong>{{t 'on_hand' }}:</strong> {{variant.count_on_hand}}</li>
       </ul>
 
       {{#if variant.option_values}}

data/app/views/spree/admin/variants/search.rabl

@@ -1,15 +1,13 @@
-object false
-child(@variants => :variants) do
-  attributes :sku, :options_text, :count_on_hand, :id, :name
+collection @variants
+attributes :sku, :options_text, :count_on_hand, :id, :name
 
-  child(:images => :images) do
-    attributes :mini_url
-  end
+child(:images => :images) do
+  attributes :mini_url
+end
 
-  child(:option_values => :option_values) do
-    child(:option_type => :option_type) do
-      attributes :name, :presentation
-    end
+child(:option_values => :option_values) do
+  child(:option_type => :option_type) do
     attributes :name, :presentation
   end
+  attributes :name, :presentation
 end

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -15,8 +15,8 @@
 </p>
 <p class="field" data-hook="card_expiration">
   <%= label_tag nil, t(:expiration) %><br />
-  <%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required') %>
-  <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
+  <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required') %>
+  <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required') %>
   <span class="required">*</span>
 </p>
 <p class="field" data-hook="card_code">

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -9,8 +9,8 @@
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.variant.display_amount %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= t('order_mailer.cancel_email.subtotal') %> <%= @order.display_item_total %>
+<%= t('order_mailer.cancel_email.subtotal', :subtotal => @order.display_item_total) %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-<%= t('order_mailer.cancel_email.total') %> <%= @order.display_total %>
+<%= t('order_mailer.cancel_email.total', :total => @order.display_total) %>