spree_core 3.4.6 → 3.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3186ecc9fcd800b68cd881887ef41fd1512a7b96215d601b013200f1b4c0e3c0
-  data.tar.gz: ba34e2b2b2ae15e75e45aea3b8d397459f91f2019895de3a8a51d20e059c5c7e
+SHA1:
+  metadata.gz: 2114cd601e774d50896839767298308294adc60e
+  data.tar.gz: be32dd8365af3332edbf8b878493bb6787b66f8f
 SHA512:
-  metadata.gz: fbabac3389a37851c3ca6b4c6814267f6d7117d8212b9035da4b9f5b9202d5b36b3b186b337a473cf80019115baba71236c1398d7599f865d43befd16a8d009f
-  data.tar.gz: c3bbc7170c4173d76201321e8e5003e502e6b657b817cd21a44e0d324f775a102ef881ecfa6ce906235a7f74717a23eb2cd735b3ead142a817e198a2363a6680
+  metadata.gz: e95baff0a25bbff9bd76cb6952303234735a063f32f6c1df521fe75f7eb8cea28b5fff67bc92da889051b70530798051afaa08c4bfdbea025fa659b2024d0149
+  data.tar.gz: 44cdda9fbf073099a0b588170ccaa2f49e35065d58c582826657d74d4e1b4b65a7fc3df4b2d6e650da5669bc9790e57b836766b91e73ee3b5f3c10daf6b5d1db

data/app/assets/javascripts/spree.js.coffee

@@ -4,7 +4,7 @@ class window.Spree
     jQuery(document).ready(callback)
 
     # fire ready callbacks also on turbolinks page change event
-    jQuery(document).on 'page:load', ->
+    jQuery(document).on 'page:load turbolinks:load', ->
       callback(jQuery)
 
   @mountedAt: ->

data/app/helpers/spree/base_helper.rb

@@ -84,6 +84,10 @@ module Spree
       v.options_text
     end
 
+    def frontend_available?
+      Spree::Core::Engine.frontend_available?
+    end
+
     private
 
     def create_product_image_tag(image, product, options, style)

data/app/models/concerns/spree/named_type.rb

@@ -4,7 +4,7 @@ module Spree
 
     included do
       scope :active, -> { where(active: true) }
-      default_scope { order("LOWER(#{table_name}.name)") }
+      default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
 
       validates :name, presence: true, uniqueness: { case_sensitive: false }
     end

data/app/models/concerns/spree/user_methods.rb

@@ -9,7 +9,11 @@ module Spree
     included do
       # we need to have this callback before any dependent: :destroy associations
       # https://github.com/rails/rails/issues/3458
+      before_validation :clone_billing_address, if: :use_billing?
       before_destroy :check_completed_orders
+      after_destroy :nullify_approver_id_in_approved_orders
+
+      attr_accessor :use_billing
 
       has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
       has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
@@ -39,10 +43,6 @@ module Spree
         first
     end
 
-    def analytics_id
-      id
-    end
-
     def total_available_store_credit
       store_credits.reload.to_a.sum(&:amount_remaining)
     end
@@ -52,5 +52,22 @@ module Spree
     def check_completed_orders
       raise Spree::Core::DestroyWithOrdersError if orders.complete.present?
     end
+
+    def nullify_approver_id_in_approved_orders
+      Spree::Order.where(approver_id: id).update_all(approver_id: nil)
+    end
+
+    def clone_billing_address
+      if bill_address && ship_address.nil?
+        self.ship_address = bill_address.clone
+      else
+        ship_address.attributes = bill_address.attributes.except('id', 'updated_at', 'created_at')
+      end
+      true
+    end
+
+    def use_billing?
+      use_billing.in?([true, 'true', '1'])
+    end
   end
 end

data/app/models/concerns/spree/user_reporting.rb

@@ -8,11 +8,11 @@ module Spree
     end
 
     def order_count
-      BigDecimal(orders.complete.size)
+      orders.complete.size
     end
 
     def average_order_value
-      if order_count.to_i > 0
+      if order_count > 0
         lifetime_value / order_count
       else
         BigDecimal('0.00')

data/app/models/spree/address.rb

@@ -10,6 +10,10 @@ module Spree
       'TO', 'TV', 'UG', 'AE', 'VU', 'YE', 'ZW'
     ].freeze
 
+    # we're not freezing this on purpose so developers can extend and manage
+    # those attributes depending of the logic of their applications
+    EXCLUDED_KEYS_FOR_COMPARISION = %w(id updated_at created_at)
+
     belongs_to :country, class_name: 'Spree::Country'
     belongs_to :state, class_name: 'Spree::State', optional: true
 
@@ -31,12 +35,7 @@ module Spree
     self.whitelisted_ransackable_attributes = %w[firstname lastname company]
 
     def self.build_default
-      country = begin
-                  Spree::Country.find(Spree::Config[:default_country_id])
-                rescue
-                  Spree::Country.first
-                end
-      new(country: country)
+      new(country: Spree::Country.default)
     end
 
     def self.default(user = nil, kind = 'bill')
@@ -47,11 +46,6 @@ module Spree
       end
     end
 
-    # Can modify an address if it's not been used in an order (but checkouts controller has finer control)
-    # def editable?
-    #   new_record? || (shipments.empty? && checkouts.empty?)
-    # end
-
     def full_name
       "#{firstname} #{lastname}".strip
     end
@@ -62,7 +56,7 @@ module Spree
 
     def same_as?(other)
       return false if other.nil?
-      attributes.except('id', 'updated_at', 'created_at') == other.attributes.except('id', 'updated_at', 'created_at')
+      attributes.except(*EXCLUDED_KEYS_FOR_COMPARISION) == other.attributes.except(*EXCLUDED_KEYS_FOR_COMPARISION)
     end
 
     alias same_as same_as?

data/app/models/spree/adjustable/adjustments_updater.rb

@@ -7,10 +7,11 @@ module Spree
 
       def initialize(adjustable)
         @adjustable = adjustable
-        adjustable.reload if shipment? && adjustable.persisted?
+        adjustable.reload if shipment? && adjustable && adjustable.persisted?
       end
 
       def update
+        return unless @adjustable
         return unless @adjustable.persisted?
 
         totals = {

data/app/models/spree/country.rb

@@ -18,7 +18,8 @@ module Spree
 
     def self.default
       country_id = Spree::Config[:default_country_id]
-      country_id.present? ? find(country_id) : find_by!(iso: 'US')
+      default = find_by(id: country_id) if country_id.present?
+      default || find_by(iso: 'US') || first
     end
 
     def <=>(other)

data/app/models/spree/line_item.rb

@@ -23,7 +23,7 @@ module Spree
     validates_with Stock::AvailabilityValidator
     validate :ensure_proper_currency, if: -> { order.present? }
 
-    before_destroy :verify_order_inventory, if: -> { order.has_checkout_step?('delivery') }
+    before_destroy :verify_order_inventory_before_destroy, if: -> { order.has_checkout_step?('delivery') }
 
     before_destroy :destroy_inventory_units
 
@@ -116,7 +116,9 @@ module Spree
     def update_price_from_modifier(currency, opts)
       if currency
         self.currency = currency
-        self.price = variant.price_in(currency).amount +
+        # variant.price_in(currency).amount can be nil if
+        # there's no price for this currency
+        self.price = (variant.price_in(currency).amount || 0) +
           variant.price_modifier_amount_in(currency, opts)
       else
         self.price = variant.price +
@@ -131,6 +133,10 @@ module Spree
     end
 
     def verify_order_inventory
+      Spree::OrderInventory.new(order, self).verify(target_shipment, is_updated: true)
+    end
+
+    def verify_order_inventory_before_destroy
       Spree::OrderInventory.new(order, self).verify(target_shipment)
     end
 

data/app/models/spree/log_entry.rb

@@ -4,7 +4,7 @@ module Spree
 
     # Fix for #1767
     # If a payment fails, we want to make sure we keep the record of it failing
-    after_rollback :save_anyway
+    after_rollback :save_anyway, if: proc { !Rails.env.test? }
 
     def save_anyway
       Spree::LogEntry.create!(source: source, details: details)

data/app/models/spree/order.rb

@@ -1,4 +1,3 @@
-require 'spree/core/validators/email'
 require 'spree/order/checkout'
 
 module Spree
@@ -51,7 +50,7 @@ module Spree
       remove_transition from: :delivery, to: :confirm
     end
 
-    self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items]
+    self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items store]
     self.whitelisted_ransackable_attributes = %w[completed_at email number state payment_state shipment_state total considered_risky]
 
     attr_reader :coupon_code
@@ -155,7 +154,7 @@ module Spree
     scope :incomplete, -> { where(completed_at: nil) }
 
     # shows completed orders first, by their completed_at date, then uncompleted orders by their created_at
-    scope :reverse_chronological, -> { order('spree_orders.completed_at IS NULL', completed_at: :desc, created_at: :desc) }
+    scope :reverse_chronological, -> { order(Arel.sql('spree_orders.completed_at IS NULL'), completed_at: :desc, created_at: :desc) }
 
     # Use this method in other gems that wish to register their own custom logic
     # that should be called after Order#update
@@ -314,6 +313,10 @@ module Spree
       Spree::TaxRate.adjust(self, shipments) if shipments.any?
     end
 
+    def create_shipment_tax_charge!
+      Spree::TaxRate.adjust(self, shipments) if shipments.any?
+    end
+
     def update_line_item_prices!
       transaction do
         line_items.each(&:update_price)
@@ -500,9 +503,8 @@ module Spree
 
     def apply_free_shipping_promotions
       Spree::PromotionHandler::FreeShipping.new(self).activate
-      shipments.each { |shipment| Adjustable::AdjustmentsUpdater.update(shipment) }
-      updater.update_shipment_total
-      persist_totals
+      shipments.each { |shipment| Spree::Adjustable::AdjustmentsUpdater.update(shipment) }
+      update_with_updater!
     end
 
     # Clean shipments and make order back to address state

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

@@ -100,6 +100,7 @@ module Spree
                 before_transition to: :delivery, do: :create_proposed_shipments
                 before_transition to: :delivery, do: :ensure_available_shipping_rates
                 before_transition to: :delivery, do: :set_shipments_cost
+                before_transition to: :delivery, do: :create_shipment_tax_charge!
                 before_transition from: :delivery, do: :apply_free_shipping_promotions
               end
 

data/app/models/spree/order_contents.rb

@@ -8,19 +8,25 @@ module Spree
 
     def add(variant, quantity = 1, options = {})
       timestamp = Time.current
-      line_item = add_to_line_item(variant, quantity, options)
-      options[:line_item_created] = true if timestamp <= line_item.created_at
-      after_add_or_remove(line_item, options)
+      ActiveRecord::Base.transaction do
+        line_item = add_to_line_item(variant, quantity, options)
+        options[:line_item_created] = true if timestamp <= line_item.created_at
+        after_add_or_remove(line_item, options)
+      end
     end
 
     def remove(variant, quantity = 1, options = {})
-      line_item = remove_from_line_item(variant, quantity, options)
-      after_add_or_remove(line_item, options)
+      ActiveRecord::Base.transaction do
+        line_item = remove_from_line_item(variant, quantity, options)
+        after_add_or_remove(line_item, options)
+      end
     end
 
     def remove_line_item(line_item, options = {})
-      line_item.destroy!
-      after_add_or_remove(line_item, options)
+      ActiveRecord::Base.transaction do
+        line_item.destroy!
+        after_add_or_remove(line_item, options)
+      end
     end
 
     def update_cart(params)
@@ -29,11 +35,13 @@ module Spree
         # Update totals, then check if the order is eligible for any cart promotions.
         # If we do not update first, then the item total will be wrong and ItemTotal
         # promotion rules would not be triggered.
-        persist_totals
-        PromotionHandler::Cart.new(order).activate
-        order.ensure_updated_shipments
-        order.payments.store_credits.checkout.destroy_all
-        persist_totals
+        ActiveRecord::Base.transaction do
+          persist_totals
+          PromotionHandler::Cart.new(order).activate
+          order.ensure_updated_shipments
+          order.payments.store_credits.checkout.destroy_all
+          persist_totals
+        end
         true
       else
         false

data/app/models/spree/order_inventory.rb

@@ -17,17 +17,19 @@ module Spree
     # In case shipment is passed the stock location should only unstock or
     # restock items if the order is completed. That is so because stock items
     # are always unstocked when the order is completed through +shipment.finalize+
-    def verify(shipment = nil)
-      if order.completed? || shipment.present?
-        units_count = inventory_units.reload.sum(&:quantity)
-        if units_count < line_item.quantity
-          quantity = line_item.quantity - units_count
-
-          shipment = determine_target_shipment unless shipment
-          add_to_shipment(shipment, quantity)
-        elsif (units_count > line_item.quantity) || (units_count == line_item.quantity && !line_item.changed?)
-          remove(units_count, shipment)
-        end
+    def verify(shipment = nil, is_updated: false)
+      return unless order.completed? || shipment.present?
+
+      units_count = inventory_units.reload.sum(&:quantity)
+      line_item_changed = is_updated ? !line_item.saved_changes? : !line_item.changed?
+
+      if units_count < line_item.quantity
+        quantity = line_item.quantity - units_count
+
+        shipment = determine_target_shipment unless shipment
+        add_to_shipment(shipment, quantity)
+      elsif (units_count > line_item.quantity) || (units_count == line_item.quantity && line_item_changed)
+        remove(units_count, shipment)
       end
     end
 
@@ -92,6 +94,7 @@ module Spree
       shipment_units = shipment.inventory_units_for_item(line_item, variant).reject(&:shipped?).sort_by(&:state)
 
       removed_quantity = 0
+      removed_backordered = 0
 
       shipment_units.each do |inventory_unit|
         inventory_unit.quantity.times do
@@ -101,6 +104,7 @@ module Spree
           else
             inventory_unit.destroy
           end
+          removed_backordered += 1 if inventory_unit.backordered?
           removed_quantity += 1
         end
         inventory_unit.save! if inventory_unit.persisted?
@@ -110,7 +114,15 @@ module Spree
 
       # removing this from shipment, and adding to stock_location
       if order.completed?
-        shipment.stock_location.restock variant, removed_quantity, shipment
+        current_on_hand = shipment.stock_location.count_on_hand(variant)
+
+        if current_on_hand.negative? && current_on_hand.abs < removed_backordered
+          shipment.stock_location.restock_backordered variant, current_on_hand.abs, shipment
+        else
+          shipment.stock_location.restock_backordered variant, removed_backordered, shipment
+        end
+
+        shipment.stock_location.restock variant, removed_quantity - removed_backordered, shipment
       end
 
       removed_quantity

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

@@ -29,7 +29,7 @@ module Spree
       # a new pending payment record for the remaining amount to capture later.
       def capture!(amount = nil)
         return true if completed?
-        amount ||= money.amount_in_cents
+        amount ||= money.money.cents
         started_processing!
         protect_from_connection_error do
           # Standard ActiveMerchant capture usage
@@ -114,7 +114,7 @@ module Spree
 
       def gateway_action(source, action, success_state)
         protect_from_connection_error do
-          response = payment_method.send(action, money.amount_in_cents,
+          response = payment_method.send(action, money.money.cents,
                                          source,
                                          gateway_options)
           handle_response(response, success_state, :failure)

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

@@ -24,7 +24,7 @@
 #
 #   # Typecasting is performed on assignment
 #   s.preferred_temperature = '24'
-#   s.preferred_color # => 24
+#   s.preferred_temperature # => 24
 #
 #   # Modifications have been made to the .preferences hash
 #   s.preferences #=> {color: 'blue', temperature: 24}

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

@@ -23,7 +23,7 @@ module Spree
         # We should not define price scopes here, as they require something slightly different
         next if name.to_s.include?('master_price')
         parts = name.to_s.match(/(.*)_by_(.*)/)
-        scope(name.to_s, -> { order("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}") })
+        scope(name.to_s, -> { order(Arel.sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}")) })
       end
     end
 

data/app/models/spree/promotion.rb

@@ -3,7 +3,7 @@ module Spree
     MATCH_POLICIES = %w(all any)
     UNACTIVATABLE_ORDER_STATES = ['complete', 'awaiting_return', 'returned']
 
-    attr_reader :eligibility_errors
+    attr_reader :eligibility_errors, :generate_code
 
     belongs_to :promotion_category, optional: true
 
@@ -54,6 +54,12 @@ module Spree
       order && !UNACTIVATABLE_ORDER_STATES.include?(order.state)
     end
 
+    def generate_code=(generating_code)
+      if ActiveModel::Type::Boolean.new.cast(generating_code)
+        self.code = random_code
+      end
+    end
+
     def expired?
       !!(starts_at && Time.current < starts_at || expires_at && Time.current > expires_at)
     end
@@ -227,5 +233,13 @@ module Spree
     def expires_at_must_be_later_than_starts_at
       errors.add(:expires_at, :invalid_date_range) if expires_at < starts_at
     end
+
+    def random_code
+      coupon_code = loop do
+        random_token = SecureRandom.hex(4)
+        break random_token unless self.class.exists?(code: random_token)
+      end
+      coupon_code
+    end
   end
 end