solidus_core 1.1.0.pre1 → 1.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a97651829c856767b16419843fcf2aa267271bc
-  data.tar.gz: d875f33165835fb31607620cdc6d668e10b6babb
+  metadata.gz: ae8ca76f31ff2adc9e441466cdb0612a00327773
+  data.tar.gz: 025e77575cb92628ce8ecc1aceb3834b8e07c475
 SHA512:
-  metadata.gz: cc874e200a655bd5ed0cdbb3e91ed51dc723391c875fce148b59a78c5b1b2dd27c15e53a08da8a7f909d790406a4055a60c20ea01cbc38760802c65ccd45f821
-  data.tar.gz: 728d34af08ff76b34b2c8e69bd1cb532c8ec27762dbea4a5a10d3f7b0a6970383d2a8ab554adeea518f89e7624f00f91f6a02c9a79bd126bf36095acf94501b0
+  metadata.gz: 2bea81b1bd27228bfacf973daedec5e4db6c0b66758eaaeedd4f4d2fa720435fd9a32b63d857f885bedc103ffadf0ee3e42ddc7f92b6eb34f28517e05f6e9bb7
+  data.tar.gz: f846e9f87d9951c77ab83ae46af5668469d3b1e58f1fe744c40772b988513fb54527d80b8a1e3d1e417a879e190783d436b95efefb4b5083b35c571b3d1965c6

data/app/mailers/spree/carton_mailer.rb

@@ -1,7 +1,18 @@
 module Spree
   class CartonMailer < BaseMailer
     # Send an email to customers to notify that an individual carton has been
-    # shipped.
+    # shipped. If a carton contains items from multiple orders then this will be
+    # called with that carton one time for each order.
+    #
+    # @param carton [Spree::Carton] the shipped carton
+    # @param order [Spree::Order] one of the orders with items in the carton
+    # @param resend [Boolean] indicates whether the email is a 'resend' (e.g.
+    #        triggered by the admin "resend" button)
+    # @return [Mail::Message]
+    #
+    # Note: The signature of this method has changed. The new (non-deprecated)
+    # signature is:
+    #   def shipped_email(carton:, order:, resend: false)
     def shipped_email(options, deprecated_options={})
       if options.is_a?(Integer)
         ActiveSupport::Deprecation.warn "Calling shipped_email with a carton_id is DEPRECATED. Instead use CartonMailer.shipped_email(order: order, carton: carton)"

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

@@ -54,19 +54,28 @@ module Spree
       alias_method :ship_address, :default_address
       alias_method :ship_address_attributes=, :default_address_attributes=
 
+      # saves address in address book
+      # sets address to the default if automatic_default_address is set to true
+      # if address is nil, does nothing and returns nil
       def ship_address=(address)
         be_default = Spree::Config.automatic_default_address
-        save_in_address_book(address.attributes, be_default)
+        save_in_address_book(address.attributes, be_default) if address
       end
 
+      # saves order.ship_address and order.bill_address in address book
+      # sets ship_address to the default if automatic_default_address is set to true
+      # sets bill_address to the default if automatic_default_address is set to true and there is no ship_address
+      # if one address is nil, does not save that address
       def persist_order_address(order)
-        if Spree::Config.automatic_default_address
-          save_in_address_book(order.ship_address.attributes, true)
-          save_in_address_book(order.bill_address.attributes, order.ship_address.nil?)
-        else
-          save_in_address_book(order.ship_address.attributes)
-          save_in_address_book(order.bill_address.attributes)
-        end
+        save_in_address_book(
+          order.ship_address.attributes,
+          Spree::Config.automatic_default_address
+        ) if order.ship_address
+
+        save_in_address_book(
+          order.bill_address.attributes,
+          order.ship_address.nil? && Spree::Config.automatic_default_address
+        ) if order.bill_address
       end
 
       # Add an address to the user's list of saved addresses for future autofill

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

@@ -23,13 +23,10 @@ module Spree
       has_many :store_credit_events, through: :store_credits
       money_methods :total_available_store_credit
 
-      def self.ransackable_associations(auth_object=nil)
-        %w[addresses]
-      end
+      include Spree::RansackableAttributes unless included_modules.include?(Spree::RansackableAttributes)
 
-      def self.ransackable_attributes(auth_object=nil)
-        %w[id email]
-      end
+      self.whitelisted_ransackable_associations = %w[addresses]
+      self.whitelisted_ransackable_attributes = %w[id email]
     end
 
     # has_spree_role? simply needs to return true or false whether a user has a role or not.

data/app/models/spree/ability.rb

@@ -51,7 +51,7 @@ module Spree
     def register_extension_abilities
       Ability.abilities.each do |clazz|
         ability = clazz.send(:new, user)
-        @rules = rules + ability.send(:rules)
+        merge(ability)
       end
     end
 

data/app/models/spree/adjustment.rb

@@ -16,7 +16,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
     belongs_to :promotion_code, :class_name => 'Spree::PromotionCode'
     belongs_to :adjustment_reason, class_name: 'Spree::AdjustmentReason', inverse_of: :adjustments
 

data/app/models/spree/app_configuration.rb

@@ -265,6 +265,17 @@ module Spree
       @promotion_chooser_class ||= Spree::PromotionChooser
     end
 
+    # Allows providing your own Mailer for shipped cartons.
+    #
+    # @!attribute [rw] carton_shipped_email_class
+    # @return [ActionMailer::Base] an object that responds to "shipped_email"
+    #   (e.g. an ActionMailer with a "shipped_email" method) with the same
+    #   signature as Spree::CartonMailer.shipped_email.
+    attr_writer :carton_shipped_email_class
+    def carton_shipped_email_class
+      @carton_shipped_email_class ||= Spree::CartonMailer
+    end
+
     def static_model_preferences
       @static_model_preferences ||= Spree::Preferences::StaticModelPreferences.new
     end

data/app/models/spree/order.rb

@@ -59,6 +59,11 @@ module Spree
     has_many :products, through: :variants
     has_many :variants, through: :line_items
     has_many :refunds, through: :payments
+    has_many :all_adjustments,
+             class_name: 'Spree::Adjustment',
+             foreign_key: :order_id,
+             dependent: :destroy,
+             inverse_of: :order
 
     has_many :order_stock_locations, class_name: "Spree::OrderStockLocation"
     has_many :stock_locations, through: :order_stock_locations
@@ -145,11 +150,6 @@ module Spree
       self.line_item_comparison_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)
-    end
-
     # For compatiblity with Calculator::PriceSack
     def amount
       line_items.inject(0.0) { |sum, li| sum + li.amount }
@@ -400,7 +400,7 @@ module Spree
 
     # Helper methods for checkout steps
     def paid?
-      payment_state == 'paid' || payment_state == 'credit_owed'
+      %w(paid credit_owed).include?(payment_state)
     end
 
     def available_payment_methods

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

@@ -126,6 +126,15 @@ module Spree
                 order.update_totals
                 order.persist_totals
               end
+
+              after_transition do |order, transition|
+                order.logger.debug "Order #{order.number} transitioned from #{transition.from} to #{transition.to} via #{transition.event}"
+              end
+
+
+              after_failure do |order, transition|
+                order.logger.debug "Order #{order.number} halted transition on event #{transition.event} state #{transition.from}: #{order.errors.full_messages.join}"
+              end
             end
 
             alias_method :save_state, :save

data/app/models/spree/order_capturing.rb

@@ -33,7 +33,10 @@ class Spree::OrderCapturing
           end
         end
       ensure
-        @order.update!
+        # FIXME: Adding the inverse_of on the payments relation for orders -should- fix this,
+        # however it only appears to make it worse (calling with changes three times instead of once.
+        # Warrants an investigation. Reloading for now.
+        @order.reload.update!
       end
     end
   end

data/app/models/spree/order_contents.rb

@@ -16,6 +16,11 @@ module Spree
       after_add_or_remove(line_item, options)
     end
 
+    def remove_line_item(line_item, options = {})
+      line_item.destroy!
+      after_add_or_remove(line_item, options)
+    end
+
     def update_cart(params)
       if order.update_attributes(params)
         unless order.completed?

data/app/models/spree/order_shipping.rb

@@ -87,7 +87,7 @@ class Spree::OrderShipping
 
   def send_shipment_emails(carton)
     carton.orders.each do |order|
-      Spree::CartonMailer.shipped_email(order: order, carton: carton).deliver_later
+      Spree::Config.carton_shipped_email_class.shipped_email(order: order, carton: carton).deliver_later
     end
   end
 end

data/app/models/spree/payment.rb

@@ -2,6 +2,9 @@ module Spree
   class Payment < Spree::Base
     include Spree::Payment::Processing
 
+    alias_attribute :identifier, :number
+    deprecate :identifier, :identifier=, deprecator: Spree::Deprecation
+
     IDENTIFIER_CHARS    = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
     NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
     RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze
@@ -255,8 +258,8 @@ module Spree
       # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
       def set_unique_identifier
         begin
-          self.identifier = generate_identifier
-        end while self.class.exists?(identifier: self.identifier)
+          self.number = generate_identifier
+        end while self.class.exists?(number: self.number)
       end
 
       def generate_identifier

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

@@ -218,7 +218,7 @@ module Spree
 
       # The unique identifier to be passed in to the payment gateway
       def gateway_order_id
-        "#{order.number}-#{self.identifier}"
+        "#{order.number}-#{self.number}"
       end
 
       def token_based?

data/app/models/spree/product.rb

@@ -25,7 +25,7 @@ module Spree
     has_many :classifications, dependent: :delete_all, inverse_of: :product
     has_many :taxons, through: :classifications, before_remove: :remove_taxon
 
-    has_many :product_promotion_rules
+    has_many :product_promotion_rules, dependent: :destroy
     has_many :promotion_rules, through: :product_promotion_rules
 
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'

data/app/models/spree/promotion.rb

@@ -16,7 +16,7 @@ module Spree
     has_many :order_promotions, class_name: "Spree::OrderPromotion"
     has_many :orders, through: :order_promotions
 
-    has_many :codes, class_name: "Spree::PromotionCode", inverse_of: :promotion
+    has_many :codes, class_name: "Spree::PromotionCode", inverse_of: :promotion, dependent: :destroy
     alias_method :promotion_codes, :codes
 
     accepts_nested_attributes_for :promotion_actions, :promotion_rules
@@ -28,6 +28,7 @@ module Spree
     validates :usage_limit, numericality: { greater_than: 0, allow_nil: true }
     validates :per_code_usage_limit, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates :description, length: { maximum: 255 }
+    validate :apply_automatically_disallowed_with_codes_or_paths
 
     before_save :normalize_blank_values
 
@@ -228,5 +229,11 @@ module Spree
     def match_all?
       match_policy == "all"
     end
+
+    def apply_automatically_disallowed_with_codes_or_paths
+      return unless apply_automatically
+      errors.add(:apply_automatically, :disallowed_with_code) if codes.any?
+      errors.add(:apply_automatically, :disallowed_with_path) if path.present?
+    end
   end
 end

data/app/models/spree/promotion/rules/first_repeat_purchase_since.rb

@@ -0,0 +1,36 @@
+module Spree
+  class Promotion
+    module Rules
+      class FirstRepeatPurchaseSince < PromotionRule
+        preference :days_ago, :integer, default: 365
+        validates :preferred_days_ago, numericality: { only_integer: true, greater_than: 0 }
+
+        # This promotion is applicable to orders only.
+        def applicable?(promotable)
+          promotable.is_a?(Spree::Order)
+        end
+
+        # This is never eligible if the order does not have a user, and that user does not have any previous completed orders.
+        #
+        # This is eligible if the user's most recently completed order is more than the preferred days ago
+        # @param order [Spree::Order]
+        # @option options
+        def eligible?(order, options = {})
+          return false unless order.user
+
+          last_order = last_completed_order(order.user)
+          return false unless last_order
+
+          last_order.completed_at < preferred_days_ago.days.ago
+        end
+
+        private
+
+        def last_completed_order user
+          user.orders.complete.order(:completed_at).last
+        end
+      end
+    end
+  end
+end
+

data/app/models/spree/promotion/rules/product.rb

@@ -6,7 +6,8 @@ module Spree
       # either come from assigned product group or are assingned directly to
       # the rule.
       class Product < PromotionRule
-        has_many :product_promotion_rules, class_name: 'Spree::ProductPromotionRule', foreign_key: :promotion_rule_id
+        has_many :product_promotion_rules, dependent: :destroy, foreign_key: :promotion_rule_id,
+                                           class_name: 'Spree::ProductPromotionRule'
         has_many :products, class_name: 'Spree::Product', through: :product_promotion_rules
 
         MATCH_POLICIES = %w(any all none)

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

@@ -40,20 +40,7 @@ module Spree
         end
 
         def sale_promotions
-          promo_table = Promotion.arel_table
-          code_table  = PromotionCode.arel_table
-
-          promotion_code_join = promo_table.join(code_table, Arel::Nodes::OuterJoin).on(
-            promo_table[:id].eq(code_table[:promotion_id])
-          ).join_sources
-
-          Promotion.active.includes(:promotion_rules).
-            joins(promotion_code_join).
-            where(
-              code_table[:value].eq(nil).and(
-                promo_table[:path].eq(nil)
-              )
-            ).distinct
+          Promotion.where(apply_automatically: true).active.includes(:promotion_rules)
         end
 
         def promotion_code(promotion)

data/app/models/spree/prototype.rb

@@ -2,7 +2,9 @@ module Spree
   class Prototype < Spree::Base
     has_and_belongs_to_many :properties, join_table: :spree_properties_prototypes
     has_and_belongs_to_many :option_types, join_table: :spree_option_types_prototypes
-    has_and_belongs_to_many :taxons, join_table: :spree_taxons_prototypes
+
+    has_many :prototype_taxons, dependent: :destroy
+    has_many :taxons, through: :prototype_taxons
 
     validates :name, presence: true
   end

data/app/models/spree/prototype_taxon.rb

@@ -0,0 +1,6 @@
+module Spree
+  class PrototypeTaxon < Spree::Base
+    belongs_to :prototype
+    belongs_to :taxon
+  end
+end

data/app/models/spree/taxon.rb

@@ -6,7 +6,8 @@ module Spree
     has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
     has_many :products, through: :classifications
 
-    has_and_belongs_to_many :prototypes, join_table: :spree_taxons_prototypes
+    has_many :prototype_taxons, dependent: :destroy
+    has_many :prototypes, through: :prototype_taxons
 
     before_create :set_permalink
 

data/app/models/spree/tracker.rb

@@ -1,7 +1,7 @@
 module Spree
   class Tracker < Spree::Base
     def self.current
-      tracker = where(active: true, environment: Rails.env).first
+      tracker = where(active: true).first
       tracker.analytics_id.present? ? tracker : nil if tracker
     end
   end

data/app/models/spree/transfer_item.rb

@@ -21,7 +21,7 @@ module Spree
     private
 
     def ensure_stock_transfer_not_closed
-      if stock_transfer_closed?
+      if stock_transfer.closed?
         errors.add(:base, Spree.t('errors.messages.cannot_modify_transfer_item_closed_stock_transfer'))
       end
     end
@@ -47,12 +47,8 @@ module Spree
       end
     end
 
-    def stock_transfer_closed?
-      stock_transfer.closed?
-    end
-
     def check_stock?
-      !stock_transfer_closed? && stock_transfer.source_location.check_stock_on_transfer?
+      !stock_transfer.shipped? && stock_transfer.source_location.check_stock_on_transfer?
     end
   end
 end

data/config/locales/en.yml

@@ -299,6 +299,11 @@ en:
           attributes:
             currency:
               must_match_order_currency: "Must match order currency"
+        spree/promotion:
+          attributes:
+            apply_automatically:
+              disallowed_with_code: Disallowed for promotions with a code
+              disallowed_with_path: Disallowed for promotions with a path
         spree/refund:
           attributes:
             amount:
@@ -589,6 +594,7 @@ en:
     cannot_rebuild_shipments_shipments_not_pending: Cannot rebuild shipments for an order with non-pending shipments.
     cannot_perform_operation: Cannot perform requested operation
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
+    cannot_update_email: You do not have access to update this user's email address. <br />Please contact a superuser if you need to perform this action.
     capture: Capture
     capture_events: Capture events
     card_code: Card Code
@@ -764,7 +770,6 @@ en:
     enable_mail_delivery: Enable Mail Delivery
     end: End
     ending_in: Ending in
-    environment: Environment
     error: error
     errors:
       messages:
@@ -1228,6 +1233,10 @@ en:
         description: Apply a promotion to every nth order a user has completed.
         name: Nth Order
         form_text: "Apply this promotion on the users Nth order: "
+      first_repeat_purchase_since:
+        description: Available only to user who have not purchased in a while
+        name: First Repeat Purchase Since
+        form_text: "Apply this promotion to users whose last order was more than X days ago: "
     promotions: Promotions
     promotion_successfully_created: Promotion has been successfully created!
     promotion_total_changed_before_complete: "One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again."