spree_core 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dcd25bc09eef1fdc85269018277aa954848fb6f
-  data.tar.gz: 6c09d32829e4e87e894c38ce1b14b6b307a97f53
+  metadata.gz: 8c5bf35a8b95692aa7ff0d8680f50c4c09fca20c
+  data.tar.gz: bb49344e459351d49fd48e2f611efb632c91df74
 SHA512:
-  metadata.gz: 4c3732fd647f46c1089fb737409226e8abc5bc0c255523f33815a8d1908fdd6f188d4cadb2bb8914db22b3bac65ea60aa8714aec919cbed2a8f475318cd9b536
-  data.tar.gz: d09f9087d47758599d36bed4852863a7dd8aadbe6dfa11ce5c279cfd654da291a976c535d0f0b159c0325c9279d6fcca7e44db755c1f70b8a195004d125a7873
+  metadata.gz: 0cc6f3c95ba0dce27047501a44aa7434479df796de8e30349d929e24bc1566729d915d53cf5e6c7503c157829784b2070f2e37929009d497f75aeb892b3d2ba7
+  data.tar.gz: 357cfcbbe86573ef29d1611cd3260957cb5650827724626b5348d2ef38ea356b30746c317ef4f94b59d448dbfb758b2832c60f3ed5a22e4f29d8d1af45360cae

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

@@ -157,11 +157,11 @@ $(document).ready(function(){
     var target = $(this).data("target");
     var new_table_row = $(target + ' tr:visible:last').clone();
     var new_id = new Date().getTime();
-    new_table_row.find("input").each(function () {
+    new_table_row.find("input, select").each(function () {
       var el = $(this);
       el.val("");
-      el.attr("id", el.attr("id").replace(/\d+/, new_id))
-      el.attr("name", el.attr("name").replace(/\d+/, new_id))
+      if (typeof el.attr("id") !== 'undefined') el.attr("id", el.attr("id").replace(/\d+/, new_id))
+      if (typeof el.attr("name") !== 'undefined') 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
@@ -185,7 +185,9 @@ $(document).ready(function(){
         },
         dataType: 'script',
         success: function(response) {
-          el.parents("tr").fadeOut('hide');
+          el.parents("tr").fadeOut('hide', function() {
+            $(this).remove();
+          })
         },
         error: function(response, textStatus, errorThrown) {
           show_flash_error(response.responseText);
@@ -199,7 +201,9 @@ $(document).ready(function(){
     el = $(this);
     el.prev("input[type=hidden]").val("1");
     el.closest(".fields").hide();
-    if (el.attr("href")) {
+    if (el.attr("href") == '#') {
+      el.parents("tr").fadeOut('hide');
+    }else if (el.attr("href")) {
       $.ajax({
         type: 'POST',
         url: el.attr("href"),

data/app/assets/javascripts/store/product.js.coffee

@@ -35,8 +35,13 @@ update_variant_price = (variant) ->
   ($ '.price.selling').text(variant_price) if variant_price
 
 $ ->
+  radios = ($ '#product-variants input[type="radio"]')
   add_image_handlers()
-  show_variant_images ($ '#product-variants input[type="radio"]').eq(0).attr('value') if ($ '#product-variants input[type="radio"]').length > 0
+
+  if radios.length > 0
+    show_variant_images radios.eq(0).attr('value') 
+    update_variant_price radios.first()
+
   ($ '#product-variants input[type="radio"]').click (event) ->
     show_variant_images @value
     update_variant_price ($ this)

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

@@ -300,7 +300,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       &#link-to-cart {
         float: right;
         padding-left: 24px;
-        background: url("cart.png") no-repeat left center;
+        background: asset-url("cart.png", image) no-repeat left center;
 
         &:hover {
           border-color: $link_text_color;

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

@@ -9,6 +9,10 @@ module Spree
 
       private
 
+        def location_after_destroy
+          admin_product_images_url(@product)
+        end
+
         def location_after_save
           admin_product_images_url(@product)
         end

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

@@ -70,13 +70,13 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       invoke_callbacks(:destroy, :after)
       flash[:success] = flash_message_for(@object, :successfully_removed)
       respond_with(@object) do |format|
-        format.html { redirect_to collection_url }
+        format.html { redirect_to location_after_destroy }
         format.js   { render :partial => "spree/admin/shared/destroy" }
       end
     else
       invoke_callbacks(:destroy, :fails)
       respond_with(@object) do |format|
-        format.html { redirect_to collection_url }
+        format.html { redirect_to location_after_destroy }
       end
     end
   end
@@ -198,6 +198,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     end
 
+    def location_after_destroy
+      collection_url
+    end
+
     def location_after_save
       collection_url
     end

data/app/controllers/spree/orders_controller.rb

@@ -26,7 +26,7 @@ module Spree
         respond_with(@order) do |format|
           format.html do
             if params.has_key?(:checkout)
-              @order.next_transition.run_callbacks
+              @order.next_transition.run_callbacks if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             else
               redirect_to cart_path

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

@@ -143,7 +143,9 @@ module Spree
       end
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
-        is_active = url.ends_with?(controller.controller_name) || url.ends_with?( "#{controller.controller_name}/edit")
+        is_active = url.ends_with?(controller.controller_name) || 
+                    url.ends_with?("#{controller.controller_name}/edit") ||
+                    url.ends_with?("#{controller.controller_name.singularize}/edit")
         options.merge!(:class => is_active ? 'active' : nil)
         content_tag(:li, options) do
           link_to(link_text, url)

data/app/models/spree/classification.rb

@@ -3,5 +3,8 @@ module Spree
     self.table_name = 'spree_products_taxons'
     belongs_to :product, :class_name => "Spree::Product"
     belongs_to :taxon, :class_name => "Spree::Taxon"
+
+    # For #3494
+    validates_uniqueness_of :taxon_id, :scope => :product_id, :message => :already_linked
   end
 end

data/app/models/spree/credit_card.rb

@@ -28,6 +28,19 @@ module Spree
       end
     end
 
+    # Some payment gateways, such as USA EPay, only support an ActiveMerchant::Billing::CreditCard
+    # object, rather than an object *like* that. So we need to convert it.
+    def to_active_merchant
+      ActiveMerchant::Billing::CreditCard.new(
+        :number => number,
+        :month => month,
+        :year => year,
+        :verification_value => verification_value,
+        :first_name => first_name,
+        :last_name => last_name
+        )
+    end
+
     # sets self.cc_type while we still have the card number
     def set_card_type
       self.cc_type ||= CardDetector.brand?(number)

data/app/models/spree/order.rb

@@ -17,7 +17,8 @@ module Spree
       go_to_state :delivery
       go_to_state :payment, :if => lambda { |order|
         # Fix for #2191
-        if order.shipping_method
+        # See #3708 also
+        if order.total.to_f <= 0 && order.shipping_method
           order.create_shipment!
           order.update_totals
         end
@@ -168,8 +169,13 @@ module Spree
     end
 
     # Used by the checkout state machine to check for unprocessed payments
-    # The Order should be unable to proceed to complete if there are unprocessed
+    # The Order should be only be able to proceed to complete if there are unprocessed
     # payments and there is payment required.
+    #
+    # The reason for this is directly before an order transitions to complete, all
+    # of the order's payments have `process!` called on it (look in order/checkout.rb).
+    # If payment *is* required and there's no payments which haven't already been tried,
+    # then the order cannot be paid for and therefore should not be able to become complete.
     def has_unprocessed_payments?
       payments.with_state('checkout').reload.exists?
     end
@@ -340,7 +346,7 @@ module Spree
     def create_shipment!
       shipping_method(true)
       if shipment.present?
-        shipment.update_attributes!(:shipping_method => shipping_method)
+        shipment.update_attributes!({:shipping_method => shipping_method, :inventory_units => self.inventory_units}, :without_protection => true)
       else
         self.shipments << Shipment.create!({ :order => self,
                                           :shipping_method => shipping_method,
@@ -383,7 +389,7 @@ module Spree
 
       # update payment and shipment(s) states, and save
       updater.update_payment_state
-      shipments.each { |shipment| shipment.update!(self) }
+      shipments.reload.each { |shipment| shipment.update!(self) }
       updater.update_shipment_state
       save
       updater.run_hooks
@@ -491,8 +497,8 @@ module Spree
     end
 
     def empty!
-      line_items.destroy_all
       adjustments.destroy_all
+      line_items.destroy_all
     end
 
     # destroy any previous adjustments.
@@ -510,12 +516,15 @@ module Spree
       state = "#{name}_state"
       if persisted?
         old_state = self.send("#{state}_was")
-        self.state_changes.create({
-          :previous_state => old_state,
-          :next_state     => self.send(state),
-          :name           => name,
-          :user_id        => self.user_id
-        }, :without_protection => true)
+        new_state = self.send(state)
+        if old_state != new_state
+          self.state_changes.create({
+            :previous_state => old_state,
+            :next_state     => self.send(state),
+            :name           => name,
+            :user_id        => self.user_id
+          }, :without_protection => true)
+        end
       end
     end
 

data/app/models/spree/payment.rb

@@ -8,7 +8,7 @@ module Spree
     has_many :offsets, :class_name => "Spree::Payment", :foreign_key => :source_id, :conditions => "source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'"
     has_many :log_entries, :as => :source
 
-    before_save :set_unique_identifier
+    before_create :set_unique_identifier
 
     after_save :create_payment_profile, :if => :profiles_supported?
 

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

@@ -155,6 +155,11 @@ module Spree
         unless response.authorization.nil?
           self.response_code = response.authorization
           self.avs_response = response.avs_result['code']
+
+          if response.cvv_result
+            self.cvv_response_code = response.cvv_result['code']
+            self.cvv_response_message = response.cvv_result['message']
+          end
         end
         self.send("#{success_state}!")
       else

data/app/models/spree/product.rb

@@ -290,7 +290,7 @@ module Spree
       # there's a weird quirk with the delegate stuff that does not automatically save the delegate object
       # when saving so we force a save using a hook.
       def save_master
-        master.save if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed || master.default_price.new_record)))
+        master.save if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
       end
 
       def ensure_master

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

@@ -68,14 +68,11 @@ module Spree
     #
     #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-        scope = select("DISTINCT ON (spree_products.id) spree_products.*")
-      else
-        scope = select("DISTINCT(spree_products.id), spree_products.*")
-      end
-
-      scope.joins(:taxons).
-      where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
+      select("spree_products.id, spree_products.*").
+      where(id: Classification.select('spree_products_taxons.product_id').
+            joins(:taxon).
+            where(Taxon.table_name => { :id => taxon.self_and_descendants.pluck(:id) })
+           )
     end
 
     # This scope selects products in all taxons AND all its descendants

data/app/views/spree/admin/adjustments/index.html.erb

@@ -4,11 +4,11 @@
    <i class="icon-arrow-right"></i> <%= t(:adjustments) %>
 <% end %>
 
-<% content_for :page_actions do %>  
+<% content_for :page_actions do %>
   <li><%= button_link_to t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus' %></li>
   <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'adjustments_table' %>
 
-<%= button_link_to t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'icon-arrow-right' %>
+<%= button_link_to t(:continue), @order.payment? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'icon-arrow-right' %>

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

@@ -20,7 +20,9 @@
       </ul>
       <div class="payment-method-settings">
         <% @payment_methods.each do |method| %>
-          <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
+          <% if method.source_required? %>
+            <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
+          <% end %>
         <% end %>
       </div>
     </div>

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

@@ -31,3 +31,7 @@
   </div>
 
 </div>
+
+<% if I18n.locale != :en %>
+  <script src='/assets/jquery.validate/localization/messages_<%= I18n.locale %>.js'></script>
+<% end %>

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

@@ -11,10 +11,12 @@
     <%= 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) %>&nbsp;&nbsp;<br />
-      </span>
+        <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %>
+      </span><br />
     <% end %>
-    <%= line_item_description(variant) %>
+    <span class="line-item-description" data-hook="line_item_description">
+      <%= line_item_description(variant) %>
+    </span>
   </td>
   <td class="cart-item-price" data-hook="cart_item_price">
     <%= line_item.single_money.to_html %>

data/config/initializers/user_class_extensions.rb

@@ -18,7 +18,7 @@ Spree::Core::Engine.config.to_prepare do
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.order('created_at DESC').last
+        spree_orders.incomplete.order('created_at DESC').first
       end
     end
   end

data/config/locales/en.yml

@@ -209,6 +209,12 @@ en:
       spree/zone:
         one: Zone
         other: Zones
+    errors:
+      models:
+        spree/classification:
+          attributes:
+            taxon_id:
+              already_linked: "is already linked to this product"
   add: Add
   add_category: "Add Category"
   add_country: "Add Country"

data/config/routes.rb

@@ -22,7 +22,7 @@ Spree::Core::Engine.routes.draw do
   get '/orders/populate', :via => :get, :to => populate_redirect
   match '/orders/:id/token/:token' => 'orders#show', :via => :get, :as => :token_order
 
-  resources :orders do
+  resources :orders, :except => [:new, :create] do
     post :populate, :on => :collection
   end
 

data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb

@@ -0,0 +1,6 @@
+class AddCvvResultCodeAndCvvResultMessageToSpreePayments < ActiveRecord::Migration
+  def change
+    add_column :spree_payments, :cvv_response_code, :string
+    add_column :spree_payments, :cvv_response_message, :string
+  end
+end

data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexToPermalinkOnSpreeProducts < ActiveRecord::Migration
+  def change
+    add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
+  end
+end

data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb

@@ -0,0 +1,6 @@
+class AddUniqueIndexToOrdersShipmentsAndStockTransfers < ActiveRecord::Migration
+  def add
+    add_index "spree_orders", ["number"], :name => "number_idx_unique", :unique => true
+    add_index "spree_shipments", ["number"], :name => "number_idx_unique", :unique => true
+  end
+end

data/db/migrate/20130813140619_expand_order_number_size.rb

@@ -0,0 +1,9 @@
+class ExpandOrderNumberSize < ActiveRecord::Migration
+  def up
+    change_column :spree_orders, :number, :string, :limit => 32
+  end
+
+  def down
+    change_column :spree_orders, :number, :string, :limit => 15
+  end
+end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -16,17 +16,14 @@ production:
 development:
   adapter: mysql2
   database: <%= database_prefix %>spree_development
-  username:
   encoding: utf8
 test:
   adapter: mysql2
   database: <%= database_prefix %>spree_test
-  username:
   encoding: utf8
 production:
   adapter: mysql2
   database: <%= database_prefix %>spree_production
-  username:
   encoding: utf8
 <% when 'postgres' %>
 development:

data/lib/spree/core/permalinks.rb

@@ -14,9 +14,9 @@ module Spree
           options[:field] ||= :permalink
           self.permalink_options = options
 
-          validates permalink_options[:field], :uniqueness => true
-
-          before_validation(:on => :create) { save_permalink }
+          if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
+            before_validation(:on => :create) { save_permalink }
+          end
         end
 
         def find_by_param(value, *args)
@@ -38,16 +38,20 @@ module Spree
       end
 
       def save_permalink(permalink_value=self.to_param)
-        field = self.class.permalink_field
-          # Do other links exist with this permalink?
-          other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
-          if other.any?
-            # Find the existing permalink with the highest number, and increment that number.
-            # (If none of the existing permalinks have a number, this will evaluate to 1.)
-            number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
-            permalink_value += "-#{number.to_s}"
-          end
-        write_attribute(field, permalink_value)
+        self.with_lock do
+          permalink_value ||= generate_permalink
+
+          field = self.class.permalink_field
+            # Do other links exist with this permalink?
+            other = self.class.select(field).where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
+            if other.any?
+              # Find the existing permalink with the highest number, and increment that number.
+              # (If none of the existing permalinks have a number, this will evaluate to 1.)
+              number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
+              permalink_value += "-#{number.to_s}"
+            end
+          write_attribute(field, permalink_value)
+        end
       end
     end
   end