spree_core 2.3.10 → 2.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728b74de9c0f8e2e371fab35a9a103a220090f4f
-  data.tar.gz: b60a27598a180ae3a23f7c449aeca221ddea1eb5
+  metadata.gz: 220579fa75f0cf4f04ad3c1688427f6ac85bd9f7
+  data.tar.gz: 4b695dfd6914c69725d8efab2b49b053ea1498ab
 SHA512:
-  metadata.gz: b70efe721217914f339f792721cdc192e80f17d2e860d8fa7983da76ba2034f071d2c04cb0b46c03e50c14180ee843ec8e224591b1c6991737f083adf5cb6f0b
-  data.tar.gz: e6e6f4412dc66a18e4f7891ebc1d9f440fb682e4f63593a35e83392a3f4982491d268e3f40e7f60f72ec67325244ba85a4ec5462a5ccc71a111cb7776ab96497
+  metadata.gz: 4753626212fc08dfd1a242773210b59e38f9da5a927da31344da74a14b24fe9a676bfacb182f1d576fc71109d9c524b970b7f458402393bb9cd5570ea07f7b46
+  data.tar.gz: 67a816dbd5d27061e1918cdcf0cd431c63b843ff944ad01d567751d9790f5d113f84b47528be164480045760d17964d4aae3583d831d66460f6927ec9fe82c8a

data/app/models/spree/adjustment.rb

@@ -24,7 +24,7 @@ module Spree
   class Adjustment < Spree::Base
     belongs_to :adjustable, polymorphic: true, touch: true
     belongs_to :source, polymorphic: true
-    belongs_to :order, class_name: "Spree::Order"
+    belongs_to :order, class_name: 'Spree::Order', inverse_of: :all_adjustments
 
     validates :adjustable, presence: true
     validates :order, presence: true

data/app/models/spree/order.rb

@@ -46,6 +46,11 @@ module Spree
     has_many :inventory_units, inverse_of: :order
     has_many :products, through: :variants
     has_many :variants, through: :line_items
+    has_many :all_adjustments,
+             class_name: 'Spree::Adjustment',
+             foreign_key: :order_id,
+             dependent: :destroy,
+             inverse_of: :order
 
     has_and_belongs_to_many :promotions, join_table: 'spree_orders_promotions'
 
@@ -115,9 +120,10 @@ module Spree
       self.update_hooks.add(hook)
     end
 
-    def all_adjustments
-      Adjustment.where("order_id = :order_id OR (adjustable_id = :order_id AND adjustable_type = 'Spree::Order')",
-        order_id: self.id)
+    # Use this method in other gems that wish to register their own custom logic
+    # that should be called when determining if two line items are equal.
+    def self.register_line_item_comparison_hook(hook)
+      self.line_item_comparison_hooks.add(hook)
     end
 
     # For compatiblity with Calculator::PriceSack

data/app/models/spree/order_updater.rb

@@ -168,10 +168,5 @@ module Spree
       order.state_changed('payment') if last_state != order.payment_state
       order.payment_state
     end
-
-    private
-      def round_money(n)
-        (n * 100).round / 100.0
-      end
   end
 end

data/app/models/spree/payment.rb

@@ -16,6 +16,7 @@ module Spree
     has_many :state_changes, as: :stateful
     has_many :capture_events, :class_name => 'Spree::PaymentCaptureEvent'
 
+    validates_presence_of :payment_method
     before_validation :validate_source
     before_create :set_unique_identifier
 
@@ -157,6 +158,10 @@ module Spree
       amount - capture_events.sum(:amount)
     end
 
+    def editable?
+      checkout? || pending?
+    end
+
     private
 
       def validate_source

data/app/models/spree/promotion_handler/cart.rb

@@ -29,22 +29,26 @@ module Spree
       end
 
       private
-        def promotions
-          promo_table = Promotion.arel_table
-          join_table = Arel::Table.new(:spree_orders_promotions)
 
-          join_condition = promo_table.join(join_table, Arel::Nodes::OuterJoin).on(
-            promo_table[:id].eq(join_table[:promotion_id])
-          ).join_sources
+      def promotions
+        # AR cannot bind raw ASTs to prepared statements. There always must be a manager around.
+        # Also Postgresql requires an aliased table for `SELECT * FROM (subexpression) AS alias`.
+        # And Sqlite3 cannot work on outher parenthesis from `(left UNION right)`.
+        # So this construct makes both happy.
+        select = Arel::SelectManager.new(
+          Promotion,
+          Promotion.arel_table.create_table_alias(
+            order.promotions.active.union(Promotion.active.where(code: nil, path: nil)),
+            Promotion.table_name
+          ),
+        )
+        select.project(Arel.star)
 
-          Promotion.active.includes(:promotion_rules).
-            joins(join_condition).
-            where(
-              promo_table[:code].eq(nil).and(
-                promo_table[:path].eq(nil)
-              ).or(join_table[:order_id].eq(order.id))
-            ).distinct
-        end
+        Promotion.find_by_sql(
+          select,
+          order.promotions.bind_values
+        )
+      end
     end
   end
 end

data/app/models/spree/stock/availability_validator.rb

@@ -5,16 +5,20 @@ module Spree
         unit_count = line_item.inventory_units.size
         return if unit_count >= line_item.quantity
         quantity = line_item.quantity - unit_count
+        return if quantity.zero?
 
         quantifier = Stock::Quantifier.new(line_item.variant)
 
-        unless quantifier.can_supply? quantity
-          variant = line_item.variant
-          display_name = %Q{#{variant.name}}
-          display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
+        return if quantifier.can_supply?(quantity)
 
-          line_item.errors[:quantity] << Spree.t(:selected_quantity_not_available, :scope => :order_populator, :item => display_name.inspect)
-        end
+        variant = line_item.variant
+        display_name = "#{variant.name}"
+        display_name += " (#{variant.options_text})" unless variant.options_text.blank?
+
+        line_item.errors[:quantity] << Spree.t(
+          :selected_quantity_not_available,
+          item: display_name.inspect
+        )
       end
     end
   end

data/app/models/spree/stock_item.rb

@@ -8,7 +8,11 @@ module Spree
 
     validates_presence_of :stock_location, :variant
     validates_uniqueness_of :variant_id, scope: [:stock_location_id, :deleted_at]
-    validates :count_on_hand, numericality: { greater_than_or_equal_to: 0 }, if: :verify_count_on_hand?
+
+    validates_numericality_of :count_on_hand,
+                              greater_than_or_equal_to: 0,
+                              less_than_or_equal_to: 2**31 - 1,
+                              only_integer: true, if: :verify_count_on_hand?
 
     delegate :weight, :should_track_inventory?, to: :variant
 

data/app/models/spree/stock_movement.rb

@@ -6,7 +6,12 @@ module Spree
     after_create :update_stock_item_quantity
 
     validates :stock_item, presence: true
-    validates :quantity, presence: true
+    validates :quantity, presence: true, numericality: {
+                 greater_than_or_equal_to: -2**31,
+                 less_than_or_equal_to: 2**31-1,
+                 only_integer: true,
+                 allow_nil: true
+              }
 
     scope :recent, -> { order('created_at DESC') }
 

data/app/models/spree/tax_rate.rb

@@ -78,7 +78,11 @@ module Spree
       rates = self.match(order_tax_zone)
       tax_categories = rates.map(&:tax_category)
       relevant_items, non_relevant_items = items.partition { |item| tax_categories.include?(item.tax_category) }
-      Spree::Adjustment.where(adjustable: relevant_items).tax.destroy_all # using destroy_all to ensure adjustment destroy callback fires.
+
+      if relevant_items.present?
+        Spree::Adjustment.where(adjustable: relevant_items).tax.destroy_all # using destroy_all to ensure adjustment destroy callback fires.
+      end
+
       relevant_items.each do |item|
         relevant_rates = rates.select { |rate| rate.tax_category == item.tax_category }
         store_pre_tax_amount(item, relevant_rates)

data/config/initializers/user_class_extensions.rb

@@ -23,6 +23,10 @@ Spree::Core::Engine.config.to_prepare do
       def last_incomplete_spree_order
         spree_orders.incomplete.where(user_id: self.id).order('created_at DESC').first
       end
+
+      def analytics_id
+        id
+      end
     end
   end
 end

data/db/migrate/20150515211137_fix_adjustment_order_id.rb

@@ -0,0 +1,70 @@
+class FixAdjustmentOrderId < ActiveRecord::Migration
+  def change
+    say 'Populate order_id from adjustable_id where appropriate'
+    execute(<<-SQL.squish)
+      UPDATE
+        spree_adjustments
+      SET
+        order_id = adjustable_id
+      WHERE
+        adjustable_type = 'Spree::Order'
+      ;
+    SQL
+
+    # Submitter of change does not care about MySQL, as it is not officially supported.
+    # Still spree officials decided to provide a working code path for MySQL users, hence
+    # submitter made a AR code path he could validate on PostgreSQL.
+    #
+    # Whoever runs a big enough MySQL installation where the AR solution hurts:
+    # Will have to write a better MySQL specific equivalent.
+    if Spree::Order.connection.adapter_name.eql?('MySQL')
+      Spree::Adjustment.where(adjustable_type: 'Spree::LineItem').find_each do |adjustment|
+        adjustment.update_columns(order_id: Spree::LineItem.find(adjustment.adjustable_id).order_id)
+      end
+    else
+      execute(<<-SQL.squish)
+        UPDATE
+          spree_adjustments
+        SET
+          order_id =
+            (SELECT order_id FROM spree_line_items WHERE spree_line_items.id = spree_adjustments.adjustable_id)
+        WHERE
+          adjustable_type = 'Spree::LineItem'
+      SQL
+    end
+
+    say 'Fix schema for spree_adjustments order_id column'
+    change_table :spree_adjustments do |t|
+      t.change :order_id, :integer, null: false
+    end
+
+    # Improved schema for postgresql, uncomment if you like it:
+    #
+    # # Negated Logical implication.
+    # #
+    # # When adjustable_type is 'Spree::Order' (p) the adjustable_id must be order_id (q).
+    # #
+    # # When adjustable_type is NOT 'Spree::Order' the adjustable id allowed to be any value (including of order_id in
+    # # case foreign keys match). XOR does not work here.
+    # #
+    # # Postgresql does not have an operator for logical implication. So we need to build the following truth table
+    # # via AND with OR:
+    # #
+    # #  p q | CHECK = !(p -> q)
+    # #  -----------
+    # #  t t | t
+    # #  t f | f
+    # #  f t | t
+    # #  f f | t
+    # #
+    # # According to de-morgans law the logical implication q -> p is equivalent to !p || q
+    # #
+    # execute(<<-SQL.squish)
+    #   ALTER TABLE ONLY spree_adjustments
+    #    ADD CONSTRAINT fk_spree_adjustments FOREIGN KEY (order_id)
+    #      REFERENCES spree_orders(id) ON UPDATE RESTRICT ON DELETE RESTRICT,
+    #    ADD CONSTRAINT check_spree_adjustments_order_id CHECK
+    #      (adjustable_type <> 'Spree::Order' OR order_id = adjustable_id);
+    # SQL
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.3.10'
+    '2.3.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.10
+  version: 2.3.11
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0.rc.3
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.64.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.64.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -244,16 +244,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.11
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -622,6 +622,7 @@ files:
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
 - db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb
+- db/migrate/20150515211137_fix_adjustment_order_id.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt