solidus_core 1.0.0.pre → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86475edf83fee14fa0acebdd78e8c0be24bd4fed
-  data.tar.gz: 83831baebdc4ce6175ebd24c62893d385e8a5595
+  metadata.gz: 37901081f12d468225a333297e72fc9b18aa4a8e
+  data.tar.gz: 7ffcaa00028db2e02b2f8ba38a81365cb5f3b47c
 SHA512:
-  metadata.gz: 86fabc1513aec6501ff3582464eaf71a2f9c68307dc3f041ea83b0940e6270754c05ac62788a586f8e3f64da5f32769e5cd5dfae900218193a49807bfd8b69e6
-  data.tar.gz: abc4b32dfc2cb617018e5568833094875462770183be4b9d24af7b905f845846c18eeb16214342717e384c2175bf9062545cd4208e0de669af35c465319fff63
+  metadata.gz: 90851a4dcb9df999a887eeb75c380a2ef27b1da6d063e34dd9a8daf2b40a1121e45e9983bb547f812f767e19f1f49bb562264fb42e57f70879eb6885b6178a47
+  data.tar.gz: b444a9f7a55c7c698d912b2dab2d6bb64c76729f4df514ba821a5d2bf922e99e514c4f2fa8e2a58977da6b9645a0b7eb8a9cf7be77f5b25685e47c4c5ff8262e

data/app/mailers/spree/carton_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       @carton = Spree::Carton.find(carton_id)
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{Spree::Store.current.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@carton.order_numbers.join(', ')}"
-      mail(to: @carton.order_emails, from: from_address, subject: subject)
+      mail(to: @carton.order_emails, from: from_address(Spree::Store.current), subject: subject)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -2,9 +2,10 @@ module Spree
   class ReimbursementMailer < BaseMailer
       def reimbursement_email(reimbursement, resend = false)
         @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
+        store = @reimbursement.order.store
         subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-        subject += "#{Spree::Store.current.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
-        mail(to: @reimbursement.order.email, from: from_address, subject: subject)
+        subject += "#{store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
+        mail(to: @reimbursement.order.email, from: from_address(store), subject: subject)
       end
   end
 end

data/app/mailers/spree/test_mailer.rb

@@ -2,7 +2,7 @@ module Spree
   class TestMailer < BaseMailer
     def test_email(email)
       subject = "#{Spree::Store.current.name} #{Spree.t('test_mailer.test_email.subject')}"
-      mail(to: email, from: from_address, subject: subject)
+      mail(to: email, from: from_address(Spree::Store.current), subject: subject)
     end
   end
 end

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

@@ -0,0 +1,49 @@
+module Spree
+  module UserMethods
+    extend ActiveSupport::Concern
+
+    include Spree::UserApiAuthentication
+    include Spree::UserReporting
+    include Spree::UserAddress
+    include Spree::UserPaymentSource
+
+    included do
+      extend Spree::DisplayMoney
+
+      has_many :role_users, foreign_key: "user_id", class_name: "Spree::RoleUser"
+      has_many :spree_roles, through: :role_users, source: :role
+
+      has_many :user_stock_locations, foreign_key: "user_id", class_name: "Spree::UserStockLocation"
+      has_many :stock_locations, through: :user_stock_locations
+
+      has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
+      has_many :orders, foreign_key: "user_id", class_name: "Spree::Order"
+
+      has_many :store_credits, -> { includes(:credit_type) }, foreign_key: "user_id", class_name: "Spree::StoreCredit"
+      has_many :store_credit_events, through: :store_credits
+      money_methods :total_available_store_credit
+
+      belongs_to :ship_address, class_name: 'Spree::Address'
+      belongs_to :bill_address, class_name: 'Spree::Address'
+    end
+
+    # has_spree_role? simply needs to return true or false whether a user has a role or not.
+    def has_spree_role?(role_in_question)
+      spree_roles.any? { |role| role.name == role_in_question.to_s }
+    end
+
+    # @return [Spree::Order] the most-recently-created incomplete order
+    # since the customer's last complete order.
+    def last_incomplete_spree_order(store: nil, only_frontend_viewable: true)
+      self_orders = self.orders
+      self_orders = self_orders.where(frontend_viewable: true) if only_frontend_viewable
+      self_orders = self_orders.where(store: store) if store
+      last_order = self_orders.order(:created_at).last
+      last_order unless last_order.try!(:completed?)
+    end
+
+    def total_available_store_credit
+      store_credits.reload.to_a.sum{ |credit| credit.amount_remaining }
+    end
+  end
+end

data/app/models/spree/ability.rb

@@ -69,6 +69,8 @@ module Spree
         ability = clazz.send(:new, user)
         @rules = rules + ability.send(:rules)
       end
+
+      Spree::RoleConfiguration.instance.activate_permissions! self, user
     end
   end
 end

data/app/models/spree/adjustment.rb

@@ -27,6 +27,7 @@ module Spree
     belongs_to :source, polymorphic: true
     belongs_to :order, class_name: "Spree::Order"
     belongs_to :promotion_code, :class_name => 'Spree::PromotionCode'
+    belongs_to :adjustment_reason, class_name: 'Spree::AdjustmentReason', inverse_of: :adjustments
 
     validates :adjustable, presence: true
     validates :order, presence: true

data/app/models/spree/adjustment_reason.rb

@@ -0,0 +1,12 @@
+module Spree
+  class AdjustmentReason < ActiveRecord::Base
+    has_many :adjustments, inverse_of: :adjustment_reason
+
+    validates :name, presence: true
+    validates :name, uniqueness: {case_sensitive: false}
+    validates :code, presence: true
+    validates :code, uniqueness: {case_sensitive: false}
+
+    scope :active, -> { where(active: true) }
+  end
+end

data/app/models/spree/app_configuration.rb

@@ -138,7 +138,7 @@ module Spree
 
     # @!attribute [rw] order_mutex_max_age
     #   @return [Integer] Max age of {OrderMutex} in seconds (default: 2 minutes)
-    preference :order_mutex_max_age, :integer, default: 2.minutes
+    preference :order_mutex_max_age, :integer, default: 120
 
     # @!attribute [rw] orders_per_page
     #   @return [Integer] Orders to show per-page in the admin (default: +15+)

data/app/models/spree/carton.rb

@@ -3,7 +3,7 @@ class Spree::Carton < ActiveRecord::Base
   belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :cartons
   belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :cartons
 
-  has_many :inventory_units, inverse_of: :carton
+  has_many :inventory_units, class_name: "Spree::InventoryUnit", inverse_of: :carton, dependent: :nullify
   has_many :orders, -> { uniq }, through: :inventory_units
   has_many :shipments, -> { uniq }, through: :inventory_units
 

data/app/models/spree/inventory_unit.rb

@@ -17,7 +17,7 @@ module Spree
 
     validates_presence_of :order, :shipment, :line_item, :variant
 
-    before_destroy :ensure_no_return_items
+    before_destroy :ensure_can_destroy
 
     scope :backordered, -> { where state: 'backordered' }
     scope :on_hand, -> { where state: 'on_hand' }
@@ -143,11 +143,15 @@ module Spree
         return_items.not_cancelled.first
       end
 
-      # If an inventory unit is associated with return items and really needs
-      # to be deleted then explicitly delete the associated return items first.
-      def ensure_no_return_items
-        if return_items.exists?
-          raise "Inventory units associated with return items should not be deleted."
+      def ensure_can_destroy
+        if !backordered? && !on_hand?
+          errors.add(:state, :cannot_destroy, state: self.state)
+          return false
+        end
+
+        unless shipment.pending?
+          errors.add(:base, :cannot_destroy_shipment_state, state: shipment.state)
+          return false
         end
       end
   end

data/app/models/spree/legacy_user.rb

@@ -4,8 +4,7 @@ module Spree
   # @note This class is intended to be modified by extensions (ex.
   #   spree_auth_devise)
   class LegacyUser < Spree::Base
-    include UserAddress
-    include UserPaymentSource
+    include UserMethods
 
     self.table_name = 'spree_users'
 
@@ -14,14 +13,8 @@ module Spree
       ActiveModel::Name.new(self, nil, "User")
     end
 
-    has_many :orders, foreign_key: :user_id
-
     before_destroy :check_completed_orders
 
-    def has_spree_role?(role)
-      true
-    end
-
     def self.model_name
       ActiveModel::Name.new Spree::LegacyUser, Spree, 'user'
     end
@@ -30,9 +23,8 @@ module Spree
     attr_accessor :password_confirmation
 
     private
-
-      def check_completed_orders
-        raise Spree::Core::DestroyWithOrdersError if orders.complete.present?
-      end
+    def check_completed_orders
+      raise Spree::Core::DestroyWithOrdersError if orders.complete.present?
+    end
   end
 end

data/app/models/spree/order.rb

@@ -13,6 +13,7 @@ module Spree
     include Spree::Order::Payments
 
     class InsufficientStock < StandardError; end
+    class CannotRebuildShipments < StandardError; end
 
     extend Spree::DisplayMoney
     money_methods :outstanding_balance, :item_total, :adjustment_total,
@@ -30,17 +31,10 @@ module Spree
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
 
-    if Spree.user_class
-      belongs_to :user, class_name: Spree.user_class.to_s
-      belongs_to :created_by, class_name: Spree.user_class.to_s
-      belongs_to :approver, class_name: Spree.user_class.to_s
-      belongs_to :canceler, class_name: Spree.user_class.to_s
-    else
-      belongs_to :user
-      belongs_to :created_by
-      belongs_to :approver
-      belongs_to :canceler
-    end
+    belongs_to :user, class_name: Spree::UserClassHandle.new
+    belongs_to :created_by, class_name: Spree::UserClassHandle.new
+    belongs_to :approver, class_name: Spree::UserClassHandle.new
+    belongs_to :canceler, class_name: Spree::UserClassHandle.new
 
     belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address'
     alias_attribute :billing_address, :bill_address
@@ -524,9 +518,15 @@ module Spree
     end
 
     def create_proposed_shipments
-      adjustments.shipping.delete_all
-      shipments.destroy_all
-      self.shipments = Spree::Stock::Coordinator.new(self).shipments
+      if completed?
+        raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_order_completed))
+      elsif shipments.any? { |s| !s.pending? }
+        raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_shipments_not_pending))
+      else
+        adjustments.shipping.destroy_all
+        shipments.destroy_all
+        self.shipments = Spree::Stock::Coordinator.new(self).shipments
+      end
     end
 
     def apply_free_shipping_promotions
@@ -542,7 +542,7 @@ module Spree
     # to delivery again so that proper updated shipments are created.
     # e.g. customer goes back from payment step and changes order items
     def ensure_updated_shipments
-      unless completed?
+      if !completed? && shipments.all?(&:pending?)
         self.shipments.destroy_all
         self.update_column(:shipment_total, 0)
         restart_checkout_flow

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

@@ -72,16 +72,7 @@ module Spree
                   transition to: :payment, from: :confirm
                 end
 
-                before_transition to: :complete do |order|
-                  if order.payment_required? && order.payments.valid.empty?
-                    order.errors.add(:base, Spree.t(:no_payment_found))
-                    false
-                  elsif order.payment_required?
-                    order.process_payments!.tap do |success|
-                      order.handle_failed_payments unless success
-                    end
-                  end
-                end
+                before_transition to: :complete, do: :process_payments_before_complete
                 after_transition to: :complete, do: :persist_user_credit_card
                 before_transition to: :payment, do: :set_shipments_cost
                 before_transition to: :payment, do: :create_tax_charge!
@@ -307,16 +298,30 @@ module Spree
             if self.payments.from_credit_card.count == 0 && self.user && self.user.default_credit_card.try(:valid?)
               cc = self.user.default_credit_card
               self.payments.create!(payment_method_id: cc.payment_method_id, source: cc)
+              self.bill_address ||= self.user.bill_address.try!(:dup) if self.user.bill_address.try!(:valid?)
             end
           end
 
-          def handle_failed_payments
-            errors = self.errors[:base]
-            self.payment_failed!
-            errors.each { |error| self.errors.add(:base, error) }
+          private
+
+          def process_payments_before_complete
+            return if !payment_required?
+
+            if payments.valid.empty?
+              errors.add(:base, Spree.t(:no_payment_found))
+              return false
+            end
+
+            if process_payments!
+              true
+            else
+              saved_errors = errors[:base]
+              payment_failed!
+              saved_errors.each { |error| errors.add(:base, error) }
+              false
+            end
           end
 
-          private
           # For payment step, filter order parameters to produce the expected nested
           # attributes for a single payment and its source, discarding attributes
           # for payment methods other than the one selected

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

@@ -9,7 +9,7 @@ module Spree
         #
         # Returns:
         #
-        # - true if all pending_payments processed successfully
+        # - true if all pending payments processed successfully
         #
         # - true if a payment failed, ie. raised a GatewayError
         #   which gets rescued and converted to TRUE when
@@ -31,10 +31,6 @@ module Spree
           process_payments_with(:purchase!)
         end
 
-        def pending_payments
-          payments.select { |payment| payment.pending? }
-        end
-
         def unprocessed_payments
           payments.select { |payment| payment.checkout? }
         end

data/app/models/spree/order_cancellations.rb

@@ -29,7 +29,7 @@ class Spree::OrderCancellations
         end
 
         update_shipped_shipments(inventory_units)
-        Spree::OrderMailer.inventory_cancellation_email(@order, inventory_units).deliver if Spree::OrderCancellations.send_cancellation_mailer
+        Spree::OrderMailer.inventory_cancellation_email(@order, inventory_units.to_a).deliver_later if Spree::OrderCancellations.send_cancellation_mailer
       end
 
       @order.update!

data/app/models/spree/order_capturing.rb

@@ -41,7 +41,7 @@ class Spree::OrderCapturing
   private
 
   def sorted_payments(order)
-    payments = order.pending_payments
+    payments = order.payments.pending
     payments = payments.sort_by { |p| [@sorted_payment_method_classes.index(p.payment_method.class), p.id] }
   end
 end

data/app/models/spree/order_mutex.rb

@@ -5,7 +5,7 @@ module Spree
 
     belongs_to :order, class_name: "Spree::Order"
 
-    scope :expired, -> { where("#{quoted_table_name}.created_at <= ?", Spree::Config[:order_mutex_max_age].ago) }
+    scope :expired, -> { where(arel_table[:created_at].lteq(Spree::Config[:order_mutex_max_age].seconds.ago)) }
 
     class << self
       # Obtain a lock on an order, execute the supplied block and then release the lock.

data/app/models/spree/order_shipping.rb

@@ -64,7 +64,7 @@ class Spree::OrderShipping
       # TODO: Remove tracking numbers from shipments.
       shipment.update_attributes!(tracking: tracking_number)
 
-      if shipment.inventory_units.all? {|iu| iu.shipped? || iu.canceled? }
+      if shipment.inventory_units(true).all? {|iu| iu.shipped? || iu.canceled? }
         # TODO: make OrderShipping#ship_shipment call Shipment#ship! rather than
         # having Shipment#ship! call OrderShipping#ship_shipment. We only really
         # need this `update_columns` for the specs, until we make that change.

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

@@ -1,11 +1,36 @@
 module Spree
   class Payment < Spree::Base
     module Processing
+      # "process!" means:
+      #   - Do nothing when:
+      #     - There is no payment method
+      #     - The payment method does not require a source
+      #     - The payment is in the "processing" state
+      #     - 'auto_capture?' is false and the payment is already authorized.
+      #   - Raise an exception when:
+      #     - The source is missing or invalid
+      #     - The payment is in a state that cannot transition to 'processing'
+      #       (failed/void/invalid states). Note: 'completed' can transition to
+      #       'processing' and thus calling #process! on a completed Payment
+      #       will attempt to re-authorize/re-purchase the payment.
+      #   - Otherwise:
+      #     - If 'auto_capture?' is true:
+      #       - Call #purchase on the payment gateway. (i.e. authorize+capture)
+      #         even if the payment is already completed.
+      #     - Else:
+      #       - Call #authorize on the payment gateway even if the payment is
+      #         already completed.
       def process!
-        if payment_method && payment_method.auto_capture?
+        return if payment_method.nil?
+
+        if payment_method.auto_capture?
           purchase!
         else
-          authorize!
+          if pending?
+            # do nothing. already authorized.
+          else
+            authorize!
+          end
         end
       end
 
@@ -106,19 +131,20 @@ module Spree
           raise ArgumentError.new("handle_payment_preconditions must be called with a block")
         end
 
-        if payment_method && payment_method.source_required?
-          if source
-            if !processing?
-              if payment_method.supports?(source) || token_based?
-                yield
-              else
-                invalidate!
-                raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
-              end
+        return if payment_method.nil?
+        return if !payment_method.source_required?
+
+        if source
+          if !processing?
+            if payment_method.supports?(source) || token_based?
+              yield
+            else
+              invalidate!
+              raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
             end
-          else
-            raise Core::GatewayError.new(Spree.t(:payment_processing_failed))
           end
+        else
+          raise Core::GatewayError.new(Spree.t(:payment_processing_failed))
         end
       end