spree_core 1.2.2 → 1.2.3

data/app/assets/javascripts/admin/admin.js.erb

@@ -104,6 +104,13 @@ $(document).ready(function(){
       el.attr("id", el.attr("id").replace(/\d+/, new_id))
       el.attr("name", el.attr("name").replace(/\d+/, new_id))
     })
+    // When cloning a new row, set the href of all icons to be an empty "#"
+    // This is so that clicking on them does not perform the actions for the
+    // duplicated row
+    new_table_row.find("a").each(function () {
+      var el = $(this);
+      el.attr('href', '#');
+    })
     $(target).append(new_table_row);
   })
 
@@ -130,8 +137,26 @@ $(document).ready(function(){
   });
 
   $('body').on('click', 'a.remove_fields', function() {
-    $(this).prev("input[type=hidden]").val("1");
-    $(this).closest(".fields").hide();
+    el = $(this);
+    el.prev("input[type=hidden]").val("1");
+    el.closest(".fields").hide();
+    if (el.attr("href")) {
+      $.ajax({
+        type: 'POST',
+        url: el.attr("href"),
+        data: { 
+          _method: 'delete',
+          authenticity_token: AUTH_TOKEN
+        },
+        success: function(response) {
+          el.parents("tr").fadeOut('hide');
+        },
+        error: function(response, textStatus, errorThrown) {
+          show_flash_error(response.responseText);
+        }
+
+      })
+    }
     return false;
   });
 

data/app/assets/javascripts/admin/taxon_autocomplete.js.erb

@@ -6,29 +6,31 @@ function cleanTaxons(data) {
 }
 
 $(document).ready(function() {
-  $("#product_taxon_ids").select2({
-    placeholder: "Add a taxon",
-    multiple: true,
-    initSelection: function(element, callback) {
-      return $.getJSON(Spree.routes.taxon_search + "?ids=" + (element.val()), null, function(data) {
-        return callback(self.cleanTaxons(data));
-      })
-    },
-    ajax: {
-      url: Spree.routes.taxon_search,
-      datatype: 'json',
-      data: function(term, page) {
-        return { q: term }
+  if ($("#product_taxon_ids").length > 0) {
+    $("#product_taxon_ids").select2({
+      placeholder: "Add a taxon",
+      multiple: true,
+      initSelection: function(element, callback) {
+        return $.getJSON(Spree.routes.taxon_search + "?ids=" + (element.val()), null, function(data) {
+          return callback(self.cleanTaxons(data));
+        })
       },
-      results: function (data, page) {
-        return { results: self.cleanTaxons(data) }
+      ajax: {
+        url: Spree.routes.taxon_search,
+        datatype: 'json',
+        data: function(term, page) {
+          return { q: term }
+        },
+        results: function (data, page) {
+          return { results: self.cleanTaxons(data) }
+        }
+      },
+      formatResult: function(taxon) {
+        return taxon.pretty_name
+      },
+      formatSelection: function(taxon) {
+        return taxon.pretty_name
       }
-    },
-    formatResult: function(taxon) {
-      return taxon.pretty_name
-    },
-    formatSelection: function(taxon) {
-      return taxon.pretty_name
-    }
-  })
+    })
+  }
 })

data/app/assets/stylesheets/store/screen.css.scss

@@ -479,6 +479,10 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
           border-color: $link_text_color;
         }
 
+        img {
+          max-width: 100%; /* Fluid images for product */
+        }
+
       }
 
       .price {
@@ -533,6 +537,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
 
       img {
         min-height: 240px;
+        max-width: 100%; /* Fluid images for product */
       }
     }
     #product-thumbnails {
@@ -600,6 +605,14 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   /*--------------------------------------*/
   /* Checkout
   /*--------------------------------------*/
+  .out-of-stock {
+    background: #df0000;
+    color: white;
+    padding: 5px;
+    padding-right: 10px;
+    font-weight: bold;
+  }
+
   .progress-steps {
     list-style: decimal inside;
     overflow: auto;

data/app/controllers/spree/admin/images_controller.rb

@@ -7,17 +7,6 @@ module Spree
       update.before :set_viewable
       destroy.before :destroy_before
 
-      def update_positions
-        params[:positions].each do |id, index|
-          Image.where(:id => id).update_all(:position => index)
-        end
-
-        respond_to do |format|
-          format.js  { render :text => 'Ok' }
-        end
-      end
-
-
       private
 
         def location_after_save

data/app/controllers/spree/admin/option_types_controller.rb

@@ -3,17 +3,6 @@ module Spree
     class OptionTypesController < ResourceController
       before_filter :setup_new_option_value, :only => [:edit]
 
-      def update_positions
-        params[:positions].each do |id, index|
-          OptionType.where(:id => id).update_all(:position => index)
-        end
-    
-        respond_to do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render :text => 'Ok' }
-        end
-      end
-
       def update_values_positions
         params[:positions].each do |id, index|
           OptionValue.where(:id => id).update_all(:position => index)
@@ -26,7 +15,7 @@ module Spree
       end
 
       protected
-    
+
         def location_after_save
           if @option_type.created_at == @option_type.updated_at
             edit_admin_option_type_url(@option_type)
@@ -44,8 +33,8 @@ module Spree
         def setup_new_option_value
           @option_type.option_values.build if @option_type.option_values.empty?
         end
-  
-        def set_available_option_types     
+
+        def set_available_option_types
           @available_option_types = if @product.option_type_ids.any?
             OptionType.where('id NOT IN (?)', @product.option_type_ids)
           else

data/app/controllers/spree/admin/option_values_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Admin
+    class OptionValuesController < Spree::Admin::BaseController
+      def destroy
+        option_value = Spree::OptionValue.find(params[:id])
+        option_value.destroy
+        render :text => nil
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/product_properties_controller.rb

@@ -5,6 +5,18 @@ module Spree
       before_filter :find_properties
       before_filter :setup_property, :only => [:index]
 
+      # We use a "custom" finder in destroy
+      # Because the request is scoped without a product
+      # on account of the request coming from the "link_to_remove_fields"
+      # helper on the admin/product_properties view
+      skip_before_filter :load_resource, :only => [:destroy]
+
+      def destroy
+        product_property = Spree::ProductProperty.find(params[:id])
+        product_property.destroy
+        render :text => nil
+      end
+
       private
         def find_properties
           @properties = Spree::Property.pluck(:name)

data/app/controllers/spree/admin/resource_controller.rb

@@ -53,6 +53,16 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
   end
 
+  def update_positions
+    params[:positions].each do |id, index|
+      model_class.where(:id => id).update_all(:position => index)
+    end
+
+    respond_to do |format|
+      format.js  { render :text => 'Ok' }
+    end
+  end
+
   def destroy
     invoke_callbacks(:destroy, :before)
     if @object.destroy

data/app/controllers/spree/admin/taxons_controller.rb

@@ -63,7 +63,7 @@ module Spree
           elsif new_position < new_siblings.index(@taxon)
             @taxon.move_to_left_of(new_siblings[new_position]) # we move up
           else
-            @taxon.move_to_right_of(new_siblings[new_position]) # we move down
+            @taxon.move_to_right_of(new_siblings[new_position-1]) # we move down
           end
           # Reset legacy position, if any extensions still rely on it
           new_parent.children.reload.each{|t| t.update_column(:position, t.position)}

data/app/controllers/spree/admin/variants_controller.rb

@@ -30,17 +30,6 @@ module Spree
         end
       end
 
-      def update_positions
-        params[:positions].each do |id, index|
-          Variant.where(:id => id).update_all(:position => index)
-        end
-
-        respond_with(@variant) do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render :text => 'Ok' }
-        end
-      end
-
       protected
 
         def create_before

data/app/controllers/spree/products_controller.rb

@@ -21,9 +21,15 @@ module Spree
 
       referer = request.env['HTTP_REFERER']
       if referer
-        referer_path = URI.parse(request.env['HTTP_REFERER']).path
-        if referer_path && referer_path.match(/\/t\/(.*)/)
-          @taxon = Taxon.find_by_permalink($1)
+        begin
+          referer_path = URI.parse(request.env['HTTP_REFERER']).path
+          # Fix for #2249
+        rescue URI::InvalidURIError
+          # Do nothing
+        else
+          if referer_path && referer_path.match(/\/t\/(.*)/)
+            @taxon = Taxon.find_by_permalink($1)
+          end
         end
       end
 

data/app/helpers/spree/admin/base_helper.rb

@@ -148,7 +148,8 @@ module Spree
 
       # renders hidden field and link to remove record using nested_attributes
       def link_to_remove_fields(name, f)
-        f.hidden_field(:_destroy) + link_to_with_icon(:delete, name, '#', :class => 'remove_fields')
+        url = f.object.persisted? ? [:admin, f.object] : '#'
+        f.hidden_field(:_destroy) + link_to_with_icon(:delete, name, url, :class => 'remove_fields')
       end
 
       def spree_dom_id(record)

data/app/helpers/spree/admin/products_helper.rb

@@ -18,7 +18,7 @@ module Spree
           content_tag(:option,
                       :value    => option_type.id,
                       :selected => ('selected' if selected)) do
-            option_type.presentation
+            option_type.name
           end
         end.join("").html_safe
       end

data/app/helpers/spree/checkout_helper.rb

@@ -4,6 +4,16 @@ module Spree
       @order.checkout_steps
     end
 
+    def state_required_class
+      'required' if state_required?
+    end
+
+    def state_required_label
+      if state_required?
+        content_tag :span, '*', :class => state_required_class
+      end
+    end
+
     def checkout_progress
       states = checkout_states
       items = states.map do |state|
@@ -27,5 +37,10 @@ module Spree
       end
       content_tag('ol', raw(items.join("\n")), :class => 'progress-steps', :id => "checkout-step-#{@order.state}")
     end
+
+    private
+    def state_required?
+      Spree::Config[:address_requires_state]
+    end
   end
 end

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

@@ -33,7 +33,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/image.rb

@@ -10,7 +10,7 @@ module Spree
                       :default_style => :product,
                       :url => '/spree/products/:id/:style/:basename.:extension',
                       :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      :convert_options => { :all => '-strip' }
+                      :convert_options => { :all => '-strip -auto-orient' }
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
     after_post_process :find_dimensions

data/app/models/spree/line_item.rb

@@ -94,7 +94,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.rb

@@ -15,9 +15,16 @@ module Spree
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
-      go_to_state :payment, :if => lambda { |order| order.payment_required? }
+      go_to_state :payment, :if => lambda { |order|
+        # Fix for #2191
+        if order.shipping_method
+          order.create_shipment!
+          order.send(:update_totals)
+        end
+        order.payment_required?
+      }
       go_to_state :confirm, :if => lambda { |order| order.confirmation_required? }
-      go_to_state :complete
+      go_to_state :complete, :if => lambda { |order| (order.payment_required? && order.payments.exists?) || !order.payment_required? }
       remove_transition :from => :delivery, :to => :confirm
     end
 
@@ -63,7 +70,8 @@ module Spree
     before_create :link_by_email
     after_create :create_tax_charge!
 
-    validates :email, :presence => true, :email => true, :if => :require_email
+    validates :email, :presence => true, :if => :require_email
+    validates :email, :email => true, :if => :require_email, :allow_blank => true
     validate :has_available_shipment
     validate :has_available_payment
 
@@ -344,6 +352,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 })
@@ -477,8 +489,17 @@ module Spree
 
     def merge!(order)
       order.line_items.each do |line_item|
-        self.add_variant(line_item.variant, line_item.quantity)
+        current_line_item = self.line_items.find_by_variant_id(line_item.variant_id)
+        if current_line_item
+          current_line_item.quantity += line_item.quantity
+          current_line_item.save
+        else
+          line_item.order_id = self.id
+          line_item.save
+        end
       end
+      # So that the destroy doesn't take out line items which may have been re-assigned
+      order.line_items.reload
       order.destroy
     end
 

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/payment.rb

@@ -32,7 +32,7 @@ module Spree
       end
       # When processing during checkout fails
       event :failure do
-        transition :from => 'processing', :to => 'failed'
+        transition :from => ['pending', 'processing'], :to => 'failed'
       end
       # With card payments this represents authorizing the payment
       event :pend do