spree_core 3.6.6 → 3.7.0.rc1

data/app/services/spree/cart/remove_item.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Cart
+    class RemoveItem
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, variant:, quantity: nil, options: nil)
+        options ||= {}
+        quantity ||= 1
+
+        ActiveRecord::Base.transaction do
+          line_item = remove_from_line_item(order: order, variant: variant, quantity: quantity, options: options)
+          Spree::Cart::Recalculate.new.call(line_item: line_item, order: order, options: options)
+          success(line_item)
+        end
+      end
+
+      private
+
+      def remove_from_line_item(order:, variant:, quantity:, options:)
+        line_item = Spree::LineItems::FindByVariant.new.execute(order: order, variant: variant, options: options)
+
+        raise ActiveRecord::RecordNotFound if line_item.nil?
+
+        line_item.quantity -= quantity
+        line_item.target_shipment = options[:shipment]
+
+        if line_item.quantity.zero?
+          order.line_items.destroy(line_item)
+        else
+          line_item.save!
+        end
+
+        line_item
+      end
+    end
+  end
+end

data/app/services/spree/cart/remove_line_item.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Cart
+    class RemoveLineItem
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, line_item:, options: nil)
+        options ||= {}
+        ActiveRecord::Base.transaction do
+          line_item.destroy!
+          Spree::Cart::Recalculate.new.call(order: order, line_item: line_item, options: options)
+        end
+        success(line_item)
+      end
+    end
+  end
+end

data/app/services/spree/cart/set_quantity.rb

@@ -0,0 +1,22 @@
+module Spree
+  module Cart
+    class SetQuantity
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, line_item:, quantity: nil)
+        ActiveRecord::Base.transaction do
+          run :change_item_quantity
+          run Spree::Cart::Recalculate
+        end
+      end
+
+      private
+
+      def change_item_quantity(order:, line_item:, quantity: nil)
+        return failure(line_item) unless line_item.update(quantity: quantity)
+
+        success(order: order, line_item: line_item)
+      end
+    end
+  end
+end

data/app/services/spree/cart/update.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Cart
+    class Update
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, params:)
+        return failure(order) unless order.update_attributes(filter_order_items(order, params))
+
+        order.line_items = order.line_items.select { |li| li.quantity > 0 }
+        # 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.
+        ActiveRecord::Base.transaction do
+          order.update_with_updater!
+          ::Spree::PromotionHandler::Cart.new(order).activate
+          order.ensure_updated_shipments
+          order.payments.store_credits.checkout.destroy_all
+          order.update_with_updater!
+        end
+        success(order)
+      end
+
+      private
+
+      def filter_order_items(order, params)
+        return params if params[:line_items_attributes].nil? || params[:line_items_attributes][:id]
+
+        line_item_ids = order.line_items.pluck(:id)
+
+        params[:line_items_attributes].each_pair do |id, value|
+          params[:line_items_attributes].delete(id) unless line_item_ids.include?(value[:id].to_i) || value[:variant_id].present?
+        end
+        params
+      end
+    end
+  end
+end

data/app/services/spree/checkout/add_store_credit.rb

@@ -0,0 +1,51 @@
+module Spree
+  module Checkout
+    class AddStoreCredit
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, amount: nil)
+        @order = order
+        return failed unless @order
+
+        remaining_total = amount ? [amount, @order.outstanding_balance].min : @order.outstanding_balance
+
+        ApplicationRecord.transaction do
+          @order.payments.store_credits.where(state: :checkout).map(&:invalidate!)
+          apply_store_credits(remaining_total) if @order.user&.store_credits&.any?
+        end
+
+        @order.reload.payments.store_credits.valid.any? ? success(@order) : failure(@order)
+      end
+
+      private
+
+      def apply_store_credits(remaining_total)
+        payment_method = Spree::PaymentMethod::StoreCredit.available.first
+        raise 'Store credit payment method could not be found' unless payment_method
+
+        @order.user.store_credits.order_by_priority.each do |credit|
+          break if remaining_total.zero?
+          next if credit.amount_remaining.zero?
+
+          amount_to_take = store_credit_amount(credit, remaining_total)
+          create_store_credit_payment(payment_method, credit, amount_to_take)
+          remaining_total -= amount_to_take
+        end
+      end
+
+      def create_store_credit_payment(payment_method, credit, amount)
+        @order.payments.create!(
+          source: credit,
+          payment_method: payment_method,
+          amount: amount,
+          state: 'checkout',
+          response_code: credit.generate_authorization_code
+        )
+      end
+
+      def store_credit_amount(credit, total)
+        [credit.amount_remaining, total].min
+      end
+    end
+  end
+end

data/app/services/spree/checkout/advance.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Checkout
+    class Advance
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        Spree::Checkout::Next.call(order: order) until cannot_make_transition?(order)
+        success(order)
+      end
+
+      private
+
+      def cannot_make_transition?(order)
+        order.confirm? || order.complete? || order.errors.present?
+      end
+    end
+  end
+end

data/app/services/spree/checkout/complete.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Checkout
+    class Complete
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        Spree::Checkout::Next.call(order: order) until cannot_make_transition?(order)
+
+        if order.reload.complete?
+          success(order)
+        else
+          failure(order)
+        end
+      end
+
+      private
+
+      def cannot_make_transition?(order)
+        order.complete? || order.errors.present?
+      end
+    end
+  end
+end

data/app/services/spree/checkout/get_shipping_rates.rb

@@ -0,0 +1,48 @@
+module Spree
+  module Checkout
+    class GetShippingRates
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        run :reload_order
+        run :ensure_shipping_address
+        run :ensure_line_items_present
+        run :generate_shipping_rates
+        run :return_shipments
+      end
+
+      private
+
+      # we need to reload order to fetch the most up-to-date version of it
+      def reload_order(order:)
+        success(order: order.reload)
+      end
+
+      def ensure_shipping_address(order:)
+        return failure([], Spree.t('errors.services.get_shipping_rates.no_shipping_address')) if order.ship_address.blank?
+
+        success(order: order)
+      end
+
+      def ensure_line_items_present(order:)
+        return failure([], Spree.t('errors.services.get_shipping_rates.no_line_items')) if order.line_items.empty?
+
+        success(order: order)
+      end
+
+      def generate_shipping_rates(order:)
+        ApplicationRecord.transaction do
+          order.create_proposed_shipments
+          order.create_shipment_tax_charge!
+          order.set_shipments_cost
+          order.apply_free_shipping_promotions
+        end
+        success(order: order.reload)
+      end
+
+      def return_shipments(order:)
+        success(order.shipments.includes([shipping_rates: :shipping_method]))
+      end
+    end
+  end
+end

data/app/services/spree/checkout/next.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Checkout
+    class Next
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        return success(order.reload) if order.next
+
+        failure(order)
+      end
+    end
+  end
+end

data/app/services/spree/checkout/remove_store_credit.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Checkout
+    class RemoveStoreCredit
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        return failed unless order
+
+        ApplicationRecord.transaction do
+          order.payments.checkout.store_credits.map(&:invalidate!) unless order.completed?
+        end
+
+        order.reload.payments.store_credits.valid.any? ? failure(order) : success(order)
+      end
+    end
+  end
+end

data/app/services/spree/checkout/update.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Checkout
+    class Update
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, params:, permitted_attributes:, request_env:)
+        return success(order) if order.update_from_params(params, permitted_attributes, request_env)
+
+        failure(order)
+      end
+    end
+  end
+end

data/app/services/spree/compare_line_items.rb

@@ -0,0 +1,21 @@
+# This class should be refactored
+module Spree
+  class CompareLineItems
+    prepend Spree::ServiceModule:: Base
+
+    def call(order:, line_item:, options: {}, comparison_hooks: Rails.application.config.spree.line_item_comparison_hooks)
+      legacy_part = comparison_hooks.all? do |hook|
+        order.send(hook, line_item, options)
+      end
+
+      success(legacy_part && compare(line_item, options))
+    end
+
+    private
+
+    # write your custom logic here
+    def compare(_line_item, _options)
+      true
+    end
+  end
+end

data/app/services/spree/generate_token.rb

@@ -0,0 +1,20 @@
+module Spree
+  class GenerateToken
+    def call(model_class = Spree::Order)
+      loop do
+        token = "#{random_token}#{unique_ending}"
+        break token unless model_class.exists?(token: token)
+      end
+    end
+
+    private
+
+    def random_token
+      SecureRandom.urlsafe_base64(nil, false)
+    end
+
+    def unique_ending
+      (Time.now.to_f * 1000).to_i
+    end
+  end
+end

data/app/sorters/spree/products/sort.rb

@@ -0,0 +1,58 @@
+module Spree
+  module Products
+    class Sort
+      def initialize(scope, params, current_currency)
+        @scope    = scope
+        @sort     = params[:sort]
+        @currency = params[:currency] || current_currency
+      end
+
+      def call
+        products = updated_at(scope)
+        products = price(products)
+
+        products
+      end
+
+      private
+
+      attr_reader :sort, :scope, :currency
+
+      def desc_order
+        @desc_order ||= String(sort)[0] == '-'
+      end
+
+      def sort_field
+        @sort_field ||= desc_order ? sort[1..-1] : sort
+      end
+
+      def updated_at?
+        sort_field == 'updated_at'
+      end
+
+      def price?
+        sort_field == 'price'
+      end
+
+      def order_direction
+        desc_order ? :desc : :asc
+      end
+
+      def updated_at(products)
+        return products unless updated_at?
+
+        products.order(updated_at: order_direction)
+      end
+
+      def price(products)
+        return products unless price?
+
+        products.joins(master: :prices).
+          select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
+          distinct.
+          where(spree_prices: { currency: currency }).
+          order("#{Spree::Price.table_name}.amount #{order_direction}")
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -1,4 +1,15 @@
 en:
+  activemodel:
+    errors:
+      models:
+        spree/fulfilment_changer:
+          attributes:
+            desired_shipment:
+              can_not_transfer_within_same_shipment: can not be same as current shipment
+              not_enough_stock_at_desired_location: not enough stock in desired stock location
+            current_shipment:
+              has_already_been_shipped: has already been shipped
+              can_not_have_backordered_inventory_units: has backordered inventory units
   activerecord:
     attributes:
       spree/address:
@@ -366,7 +377,7 @@ en:
             attachment:
               not_allowed_content_type: has not allowed content type
               attachment_must_be_present: must be present
-        spree/taxon_icon:
+        spree/taxon_image:
           attributes:
             attachment:
               not_allowed_content_type: has not allowed content type
@@ -585,6 +596,7 @@ en:
       other: 'Subtotal (%{count} items)'
     categories: Categories
     category: Category
+    channel: Channel
     charged: Charged
     checkout: Checkout
     choose_a_customer: Choose a customer
@@ -720,6 +732,10 @@ en:
         blank: can't be blank
         could_not_create_taxon: Could not create taxon
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
+      services:
+        get_shipping_rates:
+          no_shipping_address: To generate Shipping Rates Order needs to have a Shipping Address
+          no_line_items: To generate Shipping Rates you need to add some Line Items to Order
     errors_prohibited_this_record_from_being_saved:
       one: 1 error prohibited this record from being saved
       other: ! '%{count} errors prohibited this record from being saved'
@@ -804,6 +820,7 @@ en:
       other: "and %{count} others"
     instructions_to_reset_password: Please enter your email on the form below
     insufficient_stock: Insufficient stock available, only %{on_hand} remaining
+    insufficient_stock_item_quantity: Insufficient stock quantity available
     insufficient_stock_lines_present: Some line items in this order have insufficient quantity.
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
@@ -1011,6 +1028,8 @@ en:
     order_updated: Order Updated
     orders: Orders
     out_of_stock: Out of Stock
+    backordered_info: Selected item is backordered so expect delays
+    backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?
     overview: Overview
     package_from: package from
     pagination: