workarea-core 3.4.44 → 3.5.0.beta.1

data/app/models/workarea/order/fraud_decision.rb

@@ -0,0 +1,18 @@
+module Workarea
+  class Order
+    class FraudDecision
+      include ApplicationDocument
+
+      embedded_in :order, class_name: 'Workarea::Order'
+
+      field :decision, type: Symbol, default: :no_decision
+      field :analyzer, type: String
+      field :message, type: String
+      field :response, type: String
+
+      def declined?
+        decision == :declined
+      end
+    end
+  end
+end

data/app/models/workarea/order/item.rb

@@ -13,6 +13,7 @@ module Workarea
     field :total_value, type: Money, default: 0
     field :total_price, type: Money, default: 0
     field :via, type: String
+    field :requires_shipping, type: Boolean, default: true
 
     scope :by_newest, -> { desc(:created_at) }
 
@@ -36,6 +37,10 @@ module Workarea
     def digital?
       !!product_attributes['digital']
     end
+    Workarea.deprecation.deprecate_methods(
+      Order::Item,
+      digital?: 'use `!item.requires_shipping?` to determine if this item is shipped.'
+    )
 
     # Adds a price adjustment to the item. Does not persist.
     #

data/app/models/workarea/order/queries.rb

@@ -94,6 +94,7 @@ module Workarea
           Order.where(
             placed_at: nil,
             reminded_at: nil,
+            fraud_suspected_at: nil,
             :checkout_started_at.lte => Workarea.config.order_active_period.ago,
             :email.exists => true,
             :email.ne => '',

data/app/models/workarea/order/status.rb

@@ -8,7 +8,8 @@ module Workarea
           !order.canceled? &&
             !order.placed? &&
             !order.checking_out? &&
-            !order.abandoned?
+            !order.abandoned? &&
+            !order.fraud_suspected?
         end
       end
 
@@ -43,6 +44,14 @@ module Workarea
           order.abandoned?
         end
       end
+
+      class SuspectedFraud
+        include StatusCalculator::Status
+
+        def in_status?
+          order.fraud_suspected?
+        end
+      end
     end
   end
 end

data/app/models/workarea/payment.rb

@@ -65,7 +65,7 @@ module Workarea
     end
 
     def tenders
-      Workarea.config.tender_types.map do |type|
+      Workarea.config.tender_types.flat_map do |type|
         send(type)
       end.compact
     end
@@ -80,7 +80,12 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        *Workarea.config.credit_card_attributes
+        :month,
+        :year,
+        :saved_card_id,
+        :number,
+        :cvv,
+        :amount
       )
       save
     end

data/app/models/workarea/payment/credit_card.rb

@@ -17,6 +17,7 @@ module Workarea
         validate :valid_number
         validate :cvv_presence
         validate :not_expired
+        validate :issuer_accepted
 
         validates :first_name, presence: true
         validates :last_name, presence: true
@@ -85,6 +86,17 @@ module Workarea
         end
       end
 
+      def issuer_accepted
+        unless Workarea.config.credit_card_issuers.value?(issuer)
+          message = I18n.t(
+            'workarea.errors.messages.invalid_credit_card_issuer',
+            value: issuer,
+            issuers: Workarea.config.credit_card_issuers.values.to_sentence
+          )
+          errors.add(:base, message)
+        end
+      end
+
       def number_presence
         if !tokenized? && number.blank?
           errors.add(:number, I18n.t('errors.messages.blank'))

data/app/models/workarea/pricing/cache_key.rb

@@ -1,13 +1,14 @@
 module Workarea
   module Pricing
     class CacheKey
-      attr_reader :shippings
+      attr_reader :shippings, :payment
       attr_accessor :order
       delegate :pricing, :discounts, to: :@request
 
-      def initialize(order, shippings, request)
+      def initialize(order, shippings, payment, request)
         @order = order
         @shippings = shippings
+        @payment = payment
         @request = request
       end
 
@@ -17,8 +18,9 @@ module Workarea
           discount_key,
           order_key,
           shipping_service_key,
+          payment_key,
           tax_key
-        ]
+        ].compact
       end
 
       def to_s
@@ -43,6 +45,10 @@ module Workarea
         shippings.map(&:cache_key).join
       end
 
+      def payment_key
+        payment&.cache_key
+      end
+
       def tax_key
         Workarea::Tax::Category.all.map(&:cache_key).join
       end

data/app/models/workarea/pricing/calculator.rb

@@ -11,11 +11,15 @@ module Workarea
         def shippings
           @persisted_shippings
         end
+
+        def payment
+          @persisted_payment
+        end
       end
 
       included do
         attr_reader :request
-        delegate :order, :shippings, :pricing, :discounts, to: :request
+        delegate :order, :shippings, :payment, :pricing, :discounts, to: :request
       end
 
       module ClassMethods

data/app/models/workarea/pricing/calculators/tax_calculator.rb

@@ -5,6 +5,11 @@ module Workarea
         include Calculator
 
         def adjust
+          adjust_shipped_items_tax
+          adjust_not_shipped_items_tax
+        end
+
+        def adjust_shipped_items_tax
           shippings.each do |tmp_shipping|
             next unless tmp_shipping.address.present?
 
@@ -13,15 +18,37 @@ module Workarea
           end
         end
 
-        # If doing split shipping (different items go to different shipping
-        # addresses), decorate this method to return the proper price
-        # adjustments that match the shipping. (This will have to be added to
-        # the UI and saved, probably on the Shipping object)
+        def adjust_not_shipped_items_tax
+          return unless payment&.address.present?
+
+          ItemTaxApplier.new(
+            payment.address,
+            not_shipped_items_price_adjustments
+          ).apply
+        end
+
+        def shipped_items_price_adjustments
+          PriceAdjustmentSet.new(
+            order.items.select(&:requires_shipping?).flat_map(&:price_adjustments)
+          )
+        end
+
+        def not_shipped_items_price_adjustments
+          PriceAdjustmentSet.new(
+            order.items.reject(&:requires_shipping?).flat_map(&:price_adjustments)
+          )
+        end
+
+        # @deprecated As of v3.5, this class supports applying tax directly to
+        # items when they do not require shipping. As a result tax calculation
+        # is split on this distinction and this method is no longer sufficient.
+        # Instead modify the appropriate method to change the set of price
+        # adjustments to consider for tax calculation.
         #
         # @return [PriceAdjustmentSet]
         #
         def price_adjustments_for(shipping)
-          order.price_adjustments
+          shipped_items_price_adjustments
         end
       end
     end

data/app/models/workarea/pricing/discount.rb

@@ -91,8 +91,7 @@ module Workarea
       has_many :redemptions,
         class_name: 'Workarea::Pricing::Discount::Redemption'
 
-      index(active: 1)
-      index(updated_at: 1)
+      index(created_at: 1) # for DeactivateStaleDiscounts
 
       validates :name, presence: true
 
@@ -243,7 +242,7 @@ module Workarea
       # @return [Time]
       #
       def auto_deactivates_at
-        start = last_redemption.try(:created_at) || updated_at
+        start = last_redemption.try(:created_at) || created_at
         start + Workarea.config.discount_staleness_ttl
       end
 

data/app/models/workarea/pricing/discount/application_group.rb

@@ -6,7 +6,8 @@ module Workarea
 
         class << self
           def calculate(discounts, order, shippings)
-            groups = Rails.cache.fetch('discount_application_groups', expires_in: Workarea.config.cache_expirations.discount_application_groups, race_condition_ttl: 10) do
+            expiration = Workarea.config.cache_expirations.discount_application_groups
+            groups = Rails.cache.fetch(current_cache_key, expires_in: expiration, race_condition_ttl: 10) do
               # Ensure an undirected graph of compatibility on discounts
               discounts.each do |discount|
                 discount.compatible_discount_ids.each do |id|
@@ -30,8 +31,12 @@ module Workarea
             groups.map { |set| new(set.to_a, order, shippings) }
           end
 
-          def expire_cache
-            Rails.cache.delete('discount_application_groups')
+          def current_cache_key
+            [
+              'discount_application_groups',
+              Release.current&.id,
+              *Segment.current.map(&:id).sort
+            ].compact.join('/')
           end
 
           private

data/app/models/workarea/pricing/discount/free_gift.rb

@@ -125,8 +125,9 @@ module Workarea
 
         def free_product_attributes(sku)
           ttl = Workarea.config.cache_expirations.free_gift_attributes
+          key = ['workarea/free_gift', sku, Release.current&.id].compact.join('/')
 
-          Rails.cache.fetch("workarea/free_gift/#{sku}", expires_in: ttl) do
+          Rails.cache.fetch(key, expires_in: ttl) do
             Workarea::OrderItemDetails.find(sku).try(:to_h) || {}
           end
         end

data/app/models/workarea/pricing/discount/redemption.rb

@@ -18,8 +18,8 @@ module Workarea
         belongs_to :discount,
           class_name: 'Workarea::Pricing::Discount'
 
+        scope :recent, -> { desc(:created_at) }
         index({ discount_id: 1, email: 1 })
-        index({ discount_id: 1, created_at: -1 }, { background: true })
 
         before_validation :downcase_email
 

data/app/models/workarea/pricing/item_tax_applier.rb

@@ -0,0 +1,41 @@
+module Workarea
+  module Pricing
+    class ItemTaxApplier
+      include TaxApplication
+
+      def initialize(address, adjustments_to_tax)
+        @address = address
+        @adjustments_to_tax = adjustments_to_tax
+        @adjustments_by_parent = adjustments_to_tax.grouped_by_parent
+      end
+
+      def apply
+        @adjustments_to_tax.each { |adjustment| assign_item_tax(adjustment) }
+      end
+
+      private
+
+      def assign_item_tax(adjustment)
+        order_item = adjustment._parent
+        taxable_amount = @adjustments_by_parent[order_item].taxable_share_for(adjustment)
+        return if taxable_amount.zero?
+
+        rate = Tax.find_rate(adjustment.data['tax_code'], taxable_amount, @address)
+        tax_amounts = calculate_tax_amounts(taxable_amount, rate)
+        return if tax_amounts.values.sum.zero?
+
+        order_item.adjust_pricing(
+          price: 'tax',
+          calculator: self.class.name,
+          description: 'Item Tax',
+          amount: tax_amounts.values.sum,
+          data: tax_amounts.merge(
+            'adjustment' => adjustment.id,
+            'order_item_id' => adjustment._parent.id,
+            'tax_code' => adjustment.data['tax_code']
+          )
+        )
+      end
+    end
+  end
+end

data/app/models/workarea/pricing/price.rb

@@ -3,6 +3,7 @@ module Workarea
     class Price
       include ApplicationDocument
       include Releasable
+      include UnsupportedSegmentation
 
       field :min_quantity, type: Integer, default: 1
       field :regular, type: Money, default: 0

data/app/models/workarea/pricing/request.rb

@@ -4,6 +4,7 @@ module Workarea
       def initialize(order, shippings)
         @persisted_order = order
         @persisted_shippings = Array(shippings)
+        @persisted_payment = Workarea::Payment.find(order.id) rescue nil
       end
 
       # Builds a duplicate, non-persisted version of the {Workarea::Order}
@@ -44,6 +45,15 @@ module Workarea
         end
       end
 
+      def payment
+        return unless @persisted_payment.present?
+
+        @payment ||=
+          Workarea::Payment.instantiate(@persisted_payment.as_document).tap do |payment|
+            payment.new_record = true # Ensure this isn't persisted by raising duplicate key if saved
+          end
+      end
+
       # An enumerable of discounts, which allows single a single db query for discounts
       # to fix N+1 discount queries.
       #
@@ -99,6 +109,7 @@ module Workarea
         @cache_key ||= CacheKey.new(
           @persisted_order,
           @persisted_shippings,
+          @persisted_payment,
           self
         )
       end

data/app/models/workarea/pricing/sku.rb

@@ -5,6 +5,7 @@ module Workarea
 
       include ApplicationDocument
       include Releasable
+      include UnsupportedSegmentation
 
       field :_id, type: String
       field :on_sale, type: Boolean, default: false

data/app/models/workarea/pricing/tax_application.rb

@@ -0,0 +1,21 @@
+module Workarea
+  module Pricing
+    module TaxApplication
+      extend ActiveSupport::Concern
+      include GuardNegativePrice
+
+      def calculate_tax_amounts(taxable_amount, rate)
+        {
+          'country_amount' => calculate_tax_amount(taxable_amount, rate.country_percentage),
+          'region_amount' => calculate_tax_amount(taxable_amount, rate.region_percentage),
+          'postal_code_amount' => calculate_tax_amount(taxable_amount, rate.postal_code_percentage)
+        }
+      end
+
+      def calculate_tax_amount(amount, percentage)
+        return 0.to_m unless percentage.present?
+        guard_negative_price { amount * percentage }
+      end
+    end
+  end
+end

data/app/models/workarea/pricing/tax_applier.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Pricing
     class TaxApplier
-      include GuardNegativePrice
+      include TaxApplication
 
       def initialize(shipping, adjustments_to_tax)
         @shipping = shipping
@@ -30,22 +30,19 @@ module Workarea
           @shipping.address
         )
 
-        tax_amount = guard_negative_price do
-          taxable_amount * rate.percentage
-        end
-
-        return if tax_amount.zero?
+        tax_amounts = calculate_tax_amounts(taxable_amount, rate)
+        return if tax_amounts.values.sum.zero?
 
         @shipping.adjust_pricing(
           price: 'tax',
           calculator: self.class.name,
           description: 'Item Tax',
-          amount: tax_amount,
-          data: {
+          amount: tax_amounts.values.sum,
+          data: tax_amounts.merge(
             'adjustment' => adjustment.id,
             'order_item_id' => adjustment._parent.id,
             'tax_code' => adjustment.data['tax_code']
-          }
+          )
         )
       end
 
@@ -60,7 +57,7 @@ module Workarea
       end
 
       def assign_shipping_tax
-        return unless shipping_total > 0
+        return unless shipping_total.positive?
 
         tax_rate = Tax.find_rate(
           @shipping.shipping_service.tax_code,
@@ -70,18 +67,18 @@ module Workarea
 
         return unless tax_rate.charge_on_shipping?
 
-        amount = shipping_total * tax_rate.percentage
+        amounts = calculate_tax_amounts(shipping_total, tax_rate)
 
-        if amount > 0
+        if amounts.values.sum.positive?
           @shipping.adjust_pricing(
             price: 'tax',
             calculator: self.class.name,
             description: 'Shipping Tax',
-            amount: amount,
-            data: {
+            amount: amounts.values.sum,
+            data: amounts.merge(
               'shipping_service_tax' => true,
               'tax_code' => tax_rate.category.code
-            }
+            )
           )
         end
       end