spree_core 1.2.2 → 1.2.3

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

@@ -29,6 +29,7 @@ module Spree
 
       def capture!
         return true if completed?
+        started_processing!
         protect_from_connection_error do
           check_environment
 
@@ -165,10 +166,6 @@ module Spree
       end
     end
 
-    def record_log(response)
-      log_entries.create({:details => response.to_yaml}, :without_protection => true)
-    end
-
     def gateway_error(error)
       if error.is_a? ActiveMerchant::Billing::Response
         text = error.params['message'] || error.params['response_reason_text'] || error.message

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_name(name)
-            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.rb

@@ -37,7 +37,7 @@ module Spree
     has_many :variants,
       :class_name => 'Spree::Variant',
       :conditions => { :is_master => false, :deleted_at => nil },
-      :order => :position
+      :order => "#{::Spree::Variant.quoted_table_name}.position ASC"
 
     has_many :variants_including_master,
       :class_name => 'Spree::Variant',

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
@@ -47,12 +47,16 @@ module Spree
     def cost
       adjustment ? adjustment.amount : 0
     end
+
     alias_method :amount, :cost
 
     # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine :initial => 'pending', :use_transactions => false do
       event :ready do
-        transition :from => 'pending', :to => 'ready'
+        transition :from => 'pending', :to => 'ready', :if => lambda { |shipment|
+          # Fix for #2040
+          shipment.determine_state(shipment.order) == 'ready'
+        }
       end
       event :pend do
         transition :from => 'ready', :to => 'pending'
@@ -92,12 +96,24 @@ module Spree
       after_ship if new_state == 'shipped' and old_state != 'shipped'
     end
 
+    # Determines the appropriate +state+ according to the following logic:
+    #
+    # pending    unless order is complete and +order.payment_state+ is +paid+
+    # shipped    if already shipped (ie. does not change the state)
+    # ready      all other cases
+    def determine_state(order)
+      return 'pending' unless order.can_ship?
+      return 'pending' if inventory_units.any? &:backordered?
+      return 'shipped' if state == 'shipped'
+      order.paid? ? 'ready' : 'pending'
+    end
+
     private
       def generate_shipment_number
         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
@@ -113,18 +129,6 @@ module Spree
         end
       end
 
-      # Determines the appropriate +state+ according to the following logic:
-      #
-      # pending    unless order is complete and +order.payment_state+ is +paid+
-      # 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' if inventory_units.any? &:backordered?
-        return 'shipped' if state == 'shipped'
-        order.paid? ? 'ready' : 'pending'
-      end
-
       # Determines whether or not inventory units should be associated with the shipment.  This is always +false+ when
       # +Spree::Config[:track_inventory_levels]+ is set to +false.+  Otherwise its +true+ whenever the order is completed
       # (and not canceled.)

data/app/models/spree/taxonomy.rb

@@ -10,6 +10,8 @@ module Spree
 
     after_save :set_name
 
+    default_scope :order => "#{self.table_name}.position"
+
     private
       def set_name
         if root

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

@@ -13,6 +13,13 @@
     </label>
   </p>
 
+  <p data-hook="attachment_url">
+    <label>
+      <%= label_tag 'preferences[attachment_url]', t(:attachment_url) %>
+      <%= preference_field_tag 'preferences[attachment_url]', Spree::Config[:attachment_url], :type => :string, :size => 60 %>
+    </label>
+  </p>
+
   <p data-hook="attachment_default_url">
     <label>
       <%= label_tag 'preferences[attachment_default_url]', t(:attachment_default_url) %>

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

@@ -4,7 +4,7 @@
     <%= event_links %>
   </div>
   <div class="toolbar">
-    <%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'send-email' if @order.user %>
+    <%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'send-email' %>
   </div>
 </div>
 

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

@@ -35,7 +35,12 @@
       <%= f.field_container :available_on do %>
         <%= f.label :available_on, t(:available_on) %><br />
         <%= f.error_message_on :available_on %>
-        <%= f.text_field :available_on, :class => 'datepicker' %>
+        <% if @product.available_on? %>
+          <% available_on = l(@product.available_on, :format => t('spree.date_picker.format')) %>
+        <% else %>
+          <% available_on = nil %>
+        <% end %>
+        <%= f.text_field :available_on, :value => available_on, :class => 'datepicker' %>
       <% end %>
 
       <% unless @product.has_variants? %>

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

@@ -6,7 +6,7 @@
     <h5 id="order_status" data-hook><%= t(:status) %>: <%= t(@order.state, :scope => :order_state) %></h5>
     <h5 id="order_total" data-hook><%= t(:total) %>: <%= money @order.total %></h5>
     <% if @order.completed? %>
-      <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></h5>
+      <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></h5>
       <h5 id="payment_status"><%= t(:payment) %>: <%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></h5>
       <h5 id="date_completed" style="width:100%; float:none;" data-hook><%= t(:date_completed) %>: <%= I18n.l(@order.completed? ? @order.completed_at : @order.created_at) %></h5>
     <% end %>

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

@@ -1,6 +1,6 @@
 <script>
   Spree.translations = <%==
-  { :date_picker    => I18n.t(:format, 
+  { :date_picker    => I18n.t(:js_format,
                               :scope => 'spree.date_picker',
                               :default => 'yy/mm/dd'),
     :abbr_day_names => I18n.t(:abbr_day_names, :scope => :date),

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

@@ -18,7 +18,7 @@
   <% end %>
 </div>
 
-<div data-hook"admin_shipping_method_form_availability_fields">
+<div data-hook="admin_shipping_method_form_availability_fields">
   <fieldset class="categories">
     <legend><%= t(:availability) %></legend>
     <%= f.field_container :shipping_category do %>

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -1,4 +1,4 @@
-<table class="index" id='listing_taxonomies' data-hook>
+<table class="index sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
   <tr data-hook="taxonomies_header">
     <th><%= t(:name) %></th>
     <th></th>
@@ -6,6 +6,7 @@
 <% @taxonomies.each do |taxonomy| %>
   <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
     <td>
+    	<span class="handle"></span>
       <%= taxonomy.name %>
     </td>
     <td class="actions">

data/app/views/spree/checkout/_address.html.erb

@@ -38,29 +38,30 @@
         </span>
       </p>
 
-      <% if Spree::Config[:address_requires_state] %>
-        <p class="field" id="bstate">
-          <% have_states = !@order.bill_address.country.states.empty? %>
-          <%= bill_form.label :state, t(:state) %><span class="required">*</span><br />
-          <% state_elements = [
-             bill_form.collection_select(:state_id, @order.bill_address.country.states,
-                                :id, :name,
-                                {:include_blank => true},
-                                {:class => have_states ? 'required' : 'hidden',
-                                :disabled => !have_states}) +
-             bill_form.text_field(:state_name,
-                                :class => !have_states ? 'required' : 'hidden',
-                                :disabled => have_states)
-             ].join.gsub('"', "'").gsub("\n", "")
-          %>
-          <%= javascript_tag do -%>
-            document.write("<%== state_elements %>");
-          <% end -%>
-        </p>
-          <noscript>
-            <%= bill_form.text_field :state_name, :class => 'required' %>
-          </noscript>
-      <% end %>
+      <p class="field" id="bstate">
+        <% have_states = !@order.bill_address.country.states.empty? %>
+
+        <%= bill_form.label :state, t(:state) %><%= state_required_label %><br />
+
+        <% state_elements = [
+           bill_form.collection_select(:state_id, @order.bill_address.country.states,
+                              :id, :name,
+                              {:include_blank => true},
+                              {:class => have_states ? state_required_class : 'hidden',
+                              :disabled => !have_states}) +
+           bill_form.text_field(:state_name,
+                              :class => !have_states ? state_required_class : 'hidden',
+                              :disabled => have_states)
+           ].join.gsub('"', "'").gsub("\n", "")
+        %>
+        <%= javascript_tag do -%>
+          document.write("<%== state_elements %>");
+        <% end -%>
+      </p>
+
+      <noscript>
+        <%= bill_form.text_field :state_name, :class => state_required_class %>
+      </noscript>
 
       <p class="field" id="bzipcode">
         <%= bill_form.label :zipcode, t(:zip) %><span class="required">*</span><br />
@@ -86,7 +87,7 @@
   <%= form.fields_for :ship_address do |ship_form| %>
     <legend><%= t(:shipping_address) %></legend>
     <p class="field checkbox" data-hook="use_billing">
-      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %> 
+      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
       <%= label_tag :order_use_billing, t(:use_billing_address), :id => 'use_billing' %>
     </p>
     <div class="inner" data-hook="shipping_inner">
@@ -125,29 +126,28 @@
         </span>
       </p>
 
-      <% if Spree::Config[:address_requires_state] %>
-        <p class="field" id="sstate">
-          <% have_states = !@order.ship_address.country.states.empty? %>
-          <%= ship_form.label :state, t(:state) %><span class="required">*</span><br />
-          <% state_elements = [
-             ship_form.collection_select(:state_id, @order.ship_address.country.states,
-                                :id, :name,
-                                {:include_blank => true},
-                                {:class => have_states ? 'required' : 'hidden',
-                                :disabled => !have_states}) +
-             ship_form.text_field(:state_name,
-                                :class => !have_states ? 'required' : 'hidden',
-                                :disabled => have_states)
-             ].join.gsub('"', "'").gsub("\n", "")
-          %>
-          <%= javascript_tag do -%>
-            document.write("<%== state_elements %>");
-          <% end %>
-        </p>
-          <noscript>
-            <%= ship_form.text_field :state_name, :class => 'required' %>
-          </noscript>
-      <% end %>
+      <p class="field" id="sstate">
+        <% have_states = !@order.ship_address.country.states.empty? %>
+        <%= ship_form.label :state, t(:state) %><%= state_required_label %><br />
+        <% state_elements = [
+           ship_form.collection_select(:state_id, @order.ship_address.country.states,
+                              :id, :name,
+                              {:include_blank => true},
+                              {:class => have_states ? state_required_class : 'hidden',
+                              :disabled => !have_states}) +
+           ship_form.text_field(:state_name,
+                              :class => !have_states ? state_required_class : 'hidden',
+                              :disabled => have_states)
+           ].join.gsub('"', "'").gsub("\n", "")
+        %>
+        <%= javascript_tag do -%>
+          document.write("<%== state_elements %>");
+        <% end %>
+      </p>
+
+      <noscript>
+        <%= ship_form.text_field :state_name, :class => state_required_class %>
+      </noscript>
 
       <p class="field" id="szipcode">
         <%= ship_form.label :zipcode, t(:zip) %><span class="required">*</span><br />

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/layouts/spree_application.html.erb

@@ -13,7 +13,7 @@
       <div id="wrapper" class="row" data-hook>
           <%= breadcrumbs(@taxon) %>
         <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
-        <div id="content" class="columns omega <%= !content_for?(:sidebar) ? "sixteen alpha" : "twelve" %>" data-hook>
+        <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve" %>" data-hook>
           <%= flash_messages %>
           <%= yield %>
         </div>

data/app/views/spree/orders/_line_item.html.erb

@@ -11,7 +11,7 @@
     <%= variant.options_text %>
     <% if @order.insufficient_stock_lines.include? line_item %>
       <span class="out-of-stock">
-        <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %><br />
+        <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %>&nbsp;&nbsp;<br />
       </span>
     <% end %>
     <%= line_item_description(variant) %>

data/app/views/spree/products/_thumbnails.html.erb

@@ -1,19 +1,21 @@
-<!-- no need for thumnails unless there is more then one image -->
-<% if product.images.size > 1 || product.variant_images.size > 0 %>
+<%# no need for thumbnails unless there is more than one image %>
+<% if (@product.images + @product.variant_images).uniq.size > 1 %>
   <ul id="product-thumbnails" class="thumbnails inline" data-hook>
-    <% product.images.each do |i| %>
-      <li class="tmb-all" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
+    <% @product.images.each do |i| %>
+      <li class='tmb-all' id='tmb-<%= i.id %>'>
+        <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product), :class => 'tmb-all', :id => "tmb-#{i.id}") %>
+      </li>
+    <% end %>
+
+    <% if @product.has_variants? %>
+      <% @variants.select(&:available?).each do |v| %>
+        <% v.images.each do |i| %>
+          <% next if @product.images.include?(i) %>
+          <li class='vtmb-<%= v.id %> vtmb' id='tmb-<%= i.id %>'>
+            <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %>
+          </li>
+        <% end %>
+      <% end %>
     <% end %>
-    <% if @product.has_variants?
-      @variants.each do |v|
-        if v.available?
-          v.images.each do |i| %>
-            <li class="vtmb-<%= v.id.to_s %> vtmb" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
-          <%
-          end
-        end
-      end
-    end
-    %>
   </ul>
 <% end %>

data/app/views/spree/products/show.html.erb

@@ -9,7 +9,7 @@
           <%= render :partial => 'image' %>
         </div>
         <div id="thumbnails" data-hook>
-          <%= render :partial => 'thumbnails', :locals => { :product => @product } %>
+          <%= render :partial => 'thumbnails' %>
         </div>
       </div>